SPECS: chora.spec, gollem.spec, horde-nag.spec, horde-passwd.spec, ...

glen glen at pld-linux.org
Sat Sep 17 17:21:56 CEST 2005 

Author: glen                         Date: Sat Sep 17 15:21:56 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify

---- Files affected:
SPECS:
   chora.spec (1.36 -> 1.37) , gollem.spec (1.11 -> 1.12) , horde-nag.spec (1.5 -> 1.6) , horde-passwd.spec (1.32 -> 1.33) , horde.spec (1.104 -> 1.105) , imp.spec (1.87 -> 1.88) , ingo.spec (1.7 -> 1.8) , klutz.spec (1.4 -> 1.5) , kronolith.spec (1.21 -> 1.22) , mimp.spec (1.8 -> 1.9) , mnemo.spec (1.4 -> 1.5) , trean.spec (1.9 -> 1.10) , turba.spec (1.47 -> 1.48) , whups.spec (1.9 -> 1.10) , wicked.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/chora.spec
diff -u SPECS/chora.spec:1.36 SPECS/chora.spec:1.37
--- SPECS/chora.spec:1.36	Sat Sep 17 00:16:35 2005
+++ SPECS/chora.spec	Sat Sep 17 17:21:49 2005
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
-%define		_hordeapp	chora
-%define		_rc	rc1
-%define		_rel	2
-
+%define	_hordeapp	chora
+%define	_rc		rc1
+%define	_rel	2.1
+#
 %include	/usr/lib/rpm/macros.php
 Summary:	Web Based CVS Program
 Summary(pl):	Program do obsługi CVS przez WWW
@@ -15,6 +15,7 @@
 # Source0-md5:	d7956bc6a2c293d29aa609865acdb5e9
 Source1:	%{_hordeapp}.conf
 URL:		http://www.horde.org/chora/
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
@@ -28,11 +29,11 @@
 
 # horde accesses it directly in help->about
 %define		_noautocompressdoc  CREDITS
-%define		_noautoreq			'pear(Horde.*)'
+%define		_noautoreq	'pear(Horde.*)'
 
 %define		hordedir	/usr/share/horde
-%define		_appdir		%{hordedir}/%{_hordeapp}
 %define		_sysconfdir	/etc/horde.org
+%define		_appdir		%{hordedir}/%{_hordeapp}
 
 %description
 Chora is the CVS viewing frontend, one of the Horde components. It
@@ -54,22 +55,23 @@
 %setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
 tar zxf %{SOURCE0} --strip-components=1
 
+sed -i -e '
+	s,/usr/local/bin/cvsps,/usr/bin/cvsps,
+	s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/%{_hordeapp}/cvsgraph.conf,
+' config/conf.xml
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
 	$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
 
-cp -pR	*.php			$RPM_BUILD_ROOT%{_appdir}
+cp -a *.php			$RPM_BUILD_ROOT%{_appdir}
 for i in config/*.dist; do
-	cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
+	cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
 done
-
-echo "<?php ?>" > 		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
-sed -e '
-	s,/usr/local/bin/cvsps,/usr/bin/cvsps,
-	s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/%{_hordeapp}/cvsgraph.conf,
-' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
+echo '<?php ?>' >		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
+cp -p config/conf.xml	$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+touch					$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
 
 cp -pR  lib/*                   $RPM_BUILD_ROOT%{_appdir}/lib
 cp -pR  locale/*                $RPM_BUILD_ROOT%{_appdir}/locale
@@ -78,7 +80,6 @@
 
 ln -s %{_sysconfdir}/%{_hordeapp} 	$RPM_BUILD_ROOT%{_appdir}/config
 ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
 
 %clean
@@ -128,6 +129,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2005/09/17 15:21:49  glen
+- unify
+
 Revision 1.36  2005/09/16 22:16:35  glen
 - use %{_hordeapp} macro
 

================================================================
Index: SPECS/gollem.spec
diff -u SPECS/gollem.spec:1.11 SPECS/gollem.spec:1.12
--- SPECS/gollem.spec:1.11	Thu Aug 25 15:04:41 2005
+++ SPECS/gollem.spec	Sat Sep 17 17:21:49 2005
@@ -1,18 +1,23 @@
 # $Revision$, $Date$
-
+%define		_hordeapp	gollem
+#define	_snap	-
+#define	_rc		-
+%define	_rel	1.1
+#
 %include	/usr/lib/rpm/macros.php
 Summary:	Gollem - the Horde File Manager
 Summary(pl):	Gollem - zarządca plików Horde
-Name:		gollem
+Name:		%{_hordeapp}
 Version:	1.0
-Release:	1
+Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	GPL
 Group:		Applications/WWW
-Source0:	ftp://ftp.horde.org/pub/gollem/%{name}-h3-%{version}.tar.gz
+Source0:	ftp://ftp.horde.org/pub/gollem/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	29f668de08c0672169cbe52a80dc1771
-Source1:	%{name}.conf
-Patch0:		%{name}-prefs.patch
+Source1:	%{_hordeapp}.conf
+Patch0:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/gollem/
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
@@ -23,11 +28,11 @@
 
 # horde accesses it directly in help->about
 %define		_noautocompressdoc	CREDITS
-%define		_noautoreq		'pear(Horde.*)'
+%define		_noautoreq	'pear(Horde.*)'
 
 %define		hordedir	/usr/share/horde
-%define		_appdir		%{hordedir}/%{name}
 %define		_sysconfdir	/etc/horde.org
+%define		_appdir		%{hordedir}/%{_hordeapp}
 
 %description
 Gollem is the Horde File Manager, and works through any Horde_VFS
@@ -51,7 +56,7 @@
 Gollema) można znaleźć na stronie <http://www.horde.org/>.
 
 %prep
-%setup -q -n %{name}-h3-%{version}
+%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
 tar zxf %{SOURCE0} --strip-components=1
 %patch0 -p1
 
@@ -60,45 +65,42 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
 	$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes}
 
-cp -pR	*.php			$RPM_BUILD_ROOT%{_appdir}
+cp -a *.php			$RPM_BUILD_ROOT%{_appdir}
 for i in config/*.dist; do
-	cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist)
+	cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
 done
-cp -pR	config/*.xml		$RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-
-echo "<?php ?>" > 		$RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
-cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak
+echo '<?php ?>' >		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
+cp -p config/conf.xml	$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+touch					$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
 
 cp -pR lib/*			$RPM_BUILD_ROOT%{_appdir}/lib
 cp -pR locale/*			$RPM_BUILD_ROOT%{_appdir}/locale
 cp -pR templates/*		$RPM_BUILD_ROOT%{_appdir}/templates
 cp -pR themes/*			$RPM_BUILD_ROOT%{_appdir}/themes
 
-ln -s %{_sysconfdir}/%{name} 	$RPM_BUILD_ROOT%{_appdir}/config
-ln -s %{_defaultdocdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-
-install %{SOURCE1} 		$RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
+ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config
+ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then
-	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{name}/conf.php.bak
+if [ ! -f %{_sysconfdir}/%{_hordeapp}/conf.php.bak ]; then
+	install /dev/null -o root -g http -m660 %{_sysconfdir}/%{_hordeapp}/conf.php.bak
 fi
 
 %triggerin -- apache1 >= 1.3.33-2
-%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 1 -c %{_sysconfdir}/apache-%{_hordeapp}.conf
 
 %triggerun -- apache1 >= 1.3.33-2
 %apache_config_uninstall -v 1
 
 %triggerin -- apache >= 2.0.0
-%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{name}.conf
+%apache_config_install -v 2 -c %{_sysconfdir}/apache-%{_hordeapp}.conf
 
 %triggerun -- apache >= 2.0.0
 %apache_config_uninstall -v 2
@@ -106,13 +108,13 @@
 %files
 %defattr(644,root,root,755)
 %doc README docs/*
-%attr(750,root,http) %dir %{_sysconfdir}/%{name}
-%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
-%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php
-%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{name}/conf.php.bak
-%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php
-%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/credentials.php
-%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
+%attr(750,root,http) %dir %{_sysconfdir}/%{_hordeapp}
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{_hordeapp}.conf
+%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/conf.php
+%attr(660,root,http) %config(noreplace) %ghost %{_sysconfdir}/%{_hordeapp}/conf.php.bak
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/[!c]*.php
+%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{_hordeapp}/credentials.php
+%attr(640,root,http) %{_sysconfdir}/%{_hordeapp}/conf.xml
 
 %dir %{_appdir}
 %{_appdir}/*.php
@@ -129,6 +131,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2005/09/17 15:21:49  glen
+- unify
+
 Revision 1.11  2005/08/25 13:04:41  paszczus
 - release 1
 

================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.5 SPECS/horde-nag.spec:1.6
--- SPECS/horde-nag.spec:1.5	Tue Aug 23 23:08:02 2005
+++ SPECS/horde-nag.spec	Sat Sep 17 17:21:49 2005
@@ -1,27 +1,26 @@
 # $Revision$, $Date$
 # TODO
-# - rename nag.spec to tldp-nag.spec
-# - rename this spec to nag.spec
-# - or forget it and rename all horde packages to horde-*.spec
+# - rename all horde packages to horde-*.spec
 
+%define	_hordeapp nag
+#define	_snap	2005-08-01
 #define	_rc		rc1
-%define	_rel	0.3
-
-%define		_hordeapp	nag
+%define	_rel	0.5
+#
 %include	/usr/lib/rpm/macros.php
 Summary:	Nag Task List Manager
 Summary(pl):	Nag - zarządca list zadań
-Name:		nag
+Name:		%{_hordeapp}
 Version:	2.0.2
-Release:	%{?_rc:%{_rc}.}%{_rel}
+Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	GPL v2
-Vendor:		The Horde Project
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/nag/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	7aa928522dadda94f02dfcbc5fb90058
 Source1:	%{name}.conf
 Patch0:		%{name}-prefs.patch
 URL:		http://www.horde.org/nag/
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
@@ -34,9 +33,9 @@
 %define		_noautocompressdoc  CREDITS
 %define		_noautoreq	'pear(Horde.*)'
 
-%define		hordedir		/usr/share/horde
-%define		_sysconfdir		/etc/horde.org
-%define		_appdir			%{hordedir}/%{_hordeapp}
+%define		hordedir	/usr/share/horde
+%define		_sysconfdir	/etc/horde.org
+%define		_appdir		%{hordedir}/%{_hordeapp}
 
 %description
 Nag is the Horde task list application. It stores todo items, things
@@ -57,30 +56,30 @@
 Naga) można znaleźć na stronie <http://www.horde.org/>.
 
 %prep
-%setup -q -n %{?_snap:nag}%{!?_snap:nag-h3-%{version}%{?_rc:-%{_rc}}}
+%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+tar zxf %{SOURCE0} --strip-components=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
 	$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
 
-cp -pR	*.php			$RPM_BUILD_ROOT%{_appdir}
+cp -a *.php			$RPM_BUILD_ROOT%{_appdir}
 for i in config/*.dist; do
-	cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
+	cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
 done
-echo "<?php ?>" > 		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
-install  config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
+echo '<?php ?>' >		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
+cp -p config/conf.xml	$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+touch					$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
 
 cp -pR	lib/*			$RPM_BUILD_ROOT%{_appdir}/lib
 cp -pR	locale/*		$RPM_BUILD_ROOT%{_appdir}/locale
 cp -pR	templates/*		$RPM_BUILD_ROOT%{_appdir}/templates
 cp -pR	themes/*		$RPM_BUILD_ROOT%{_appdir}/themes
 
-ln -s %{_sysconfdir}/%{_hordeapp} 	$RPM_BUILD_ROOT%{_appdir}/config
+ln -s %{_sysconfdir}/%{_hordeapp} $RPM_BUILD_ROOT%{_appdir}/config
 ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-
-install %{SOURCE1} 		$RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{_hordeapp}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +94,7 @@
 IMPORTANT:
 If you are installing for the first time, You may need to
 create the Nag database tables. To do so run:
-zcat %{_docdir}/%{name}-%{version}/scripts/sql/nag.sql.gz | mysql horde
+zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{_hordeapp}.sql.gz | mysql horde
 EOF
 fi
 
@@ -124,6 +123,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/09/17 15:21:49  glen
+- unify
+
 Revision 1.5  2005/08/23 21:08:02  glen
 - unify with horde-passwd.spec
 

================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.32 SPECS/horde-passwd.spec:1.33
--- SPECS/horde-passwd.spec:1.32	Wed Sep 14 15:07:56 2005
+++ SPECS/horde-passwd.spec	Sat Sep 17 17:21:49 2005
@@ -3,14 +3,14 @@
 #define		_snap	2005-09-10
 %define		_rc		rc1
 %define		_rel	1
+#
 %include	/usr/lib/rpm/macros.php
 Summary:	passwd - password change module for Horde
 Summary(pl):	passwd - moduł do zmieniania haseł w Horde
-Name:		horde-passwd
+Name:		horde-%{_hordeapp}
 Version:	3.0
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	%{?_rc:1.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	ASL
-Vendor:		The Horde Project
 Group:		Applications/WWW
 #Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 Source0:	ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
@@ -31,7 +31,7 @@
 
 # horde accesses it directly in help->about
 %define		_noautocompressdoc  CREDITS
-%define		_noautoreq	'pear(Horde/.*)'
+%define		_noautoreq	'pear(Horde.*)'
 
 %define		hordedir	/usr/share/horde
 %define		_sysconfdir	/etc/horde.org
@@ -49,7 +49,7 @@
 moduł.
 
 %prep
-%setup -q -c -T -n %{?_snap:%{name}-%{_snap}}%{!?_snap:%{name}-%{version}%{?_rc:-%{_rc}}}
+%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
 tar zxf %{SOURCE0} --strip-components=1
 
 rm -f scripts/.htaccess
@@ -58,17 +58,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/%{_hordeapp}} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp} \
 	$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,scripts,templates,themes}
 
 cp -pR	*.php			$RPM_BUILD_ROOT%{_appdir}
 for i in config/*.dist; do
 	cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
 done
-
-echo "<?php ?>" > 		$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
-install config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
-> $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
+echo '<?php ?>' > $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php
+cp -p config/conf.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
+touch					$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
 
 cp -pR	lib/*			$RPM_BUILD_ROOT%{_appdir}/lib
 cp -pR	locale/*		$RPM_BUILD_ROOT%{_appdir}/locale
@@ -142,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2005/09/17 15:21:49  glen
+- unify
+
 Revision 1.32  2005/09/14 13:07:56  glen
 - really use macros in Release. i must be tired
 

================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.104 SPECS/horde.spec:1.105
--- SPECS/horde.spec:1.104	Sat Sep 17 03:16:29 2005
+++ SPECS/horde.spec	Sat Sep 17 17:21:49 2005
@@ -3,7 +3,7 @@
 #define	_snap	2005-08-01
 #define	_rc		rc1
 %define	_rel	2
-#
+
 # TODO:
 # - support for Oracle and Sybase
 # - Support SQLite and Oracle in all SQL configurations.
@@ -22,7 +22,6 @@
 Version:	3.0.5
 Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	LGPL
-Vendor:		The Horde Project
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/horde/%{_hordeapp}-%{version}.tar.gz
 # Source0-md5:	31ee0819be4efe44819f8ffef5db5365
@@ -65,7 +64,7 @@
 %define		_noautocompressdoc  CREDITS
 %define		_noautoreq	'pear(XML/WBXML.*)' 'pear(Horde.*)' 'pear(Text/.*)' 'pear(Net/IMSP.*)'
 
-%define		hordedir	%{_datadir}/horde
+%define		hordedir	/usr/share/horde
 %define		_sysconfdir	/etc/horde.org
 %define		_appdir		%{hordedir}
 %define		schemadir	/usr/share/openldap/schema
@@ -140,7 +139,6 @@
 for i in config/*.php.dist; do
 	cp -a $i $RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/$(basename $i .dist)
 done
-
 cp -p config/conf.xml	$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.xml
 touch					$RPM_BUILD_ROOT%{_sysconfdir}/%{_hordeapp}/conf.php.bak
 
@@ -333,6 +331,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2005/09/17 15:21:49  glen
+- unify
+
 Revision 1.104  2005/09/17 01:16:29  glen
 - one more correction
 

================================================================
Index: SPECS/imp.spec
diff -u SPECS/imp.spec:1.87 SPECS/imp.spec:1.88
--- SPECS/imp.spec:1.87	Sat Sep 17 17:08:54 2005
+++ SPECS/imp.spec	Sat Sep 17 17:21:50 2005
@@ -20,6 +20,7 @@
 Source1:	%{_hordeapp}.conf
 Patch0:		%{_hordeapp}-path.patch
 URL:		http://www.horde.org/imp/
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
@@ -159,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2005/09/17 15:21:50  glen
+- unify
+
 Revision 1.87  2005/09/17 15:08:54  glen
 - merge 4.0.4rc2 from DEVEL; fix md5
 

================================================================
Index: SPECS/ingo.spec
diff -u SPECS/ingo.spec:1.7 SPECS/ingo.spec:1.8
--- SPECS/ingo.spec:1.7	Sat Sep 17 02:40:59 2005
+++ SPECS/ingo.spec	Sat Sep 17 17:21:50 2005
@@ -17,6 +17,7 @@
 Source1:	%{_hordeapp}.conf
 Patch0:		%{_hordeapp}-path.patch
 URL:		http://www.horde.org/ingo/
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
@@ -29,7 +30,7 @@
 %define		_noautocompressdoc  CREDITS
 %define		_noautoreq	'pear(Horde.*)'
 
-%define		hordedir	%{_datadir}/horde
+%define		hordedir	/usr/share/horde
 %define		_sysconfdir	/etc/horde.org
 %define		_appdir		%{hordedir}/%{_hordeapp}
 
@@ -135,6 +136,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/09/17 15:21:50  glen
+- unify
+
 Revision 1.7  2005/09/17 00:40:59  glen
 - merged 1.0.2rc1 from DEVEL
 - using %{_hordeapp} macro

================================================================
Index: SPECS/klutz.spec
diff -u SPECS/klutz.spec:1.4 SPECS/klutz.spec:1.5
--- SPECS/klutz.spec:1.4	Sat Sep 17 03:30:39 2005
+++ SPECS/klutz.spec	Sat Sep 17 17:21:50 2005
@@ -16,6 +16,7 @@
 # Source0-md5:	3d3ef21991c2f8b3ac42f37d9ff76ac5
 Source1:	%{_hordeapp}.conf
 URL:		http://www.horde.org/klutz/
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires:	apache >= 1.3.33-2
@@ -26,11 +27,11 @@
 
 # horde accesses it directly in help->about
 %define		_noautocompressdoc  CREDITS
-%define		_noautoreq		'pear(Horde.*)'
+%define		_noautoreq	'pear(Horde.*)'
 
-%define		hordedir	%{_datadir}/horde
+%define		hordedir	/usr/share/horde
 %define		_sysconfdir	/etc/horde.org
-%define		_appdir		%{hordedir}/%{name}
+%define		_appdir		%{hordedir}/%{_hordeapp}
 
 %description
 Klutz is an application for viewing comic strips. It lets you view
@@ -133,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2005/09/17 15:21:50  glen
+- unify
+
 Revision 1.4  2005/09/17 01:30:39  glen
 - using %{_hordeapp} macro, cosmetics
 

================================================================
Index: SPECS/kronolith.spec
diff -u SPECS/kronolith.spec:1.21 SPECS/kronolith.spec:1.22
--- SPECS/kronolith.spec:1.21	Sat Sep 17 13:12:17 2005
+++ SPECS/kronolith.spec	Sat Sep 17 17:21:50 2005
@@ -4,15 +4,13 @@
 %define	_rc		rc1
 %define	_rel	0.1
 #
-%define		_rc	rc1
 %include	/usr/lib/rpm/macros.php
-Summary:	Kronolith - calendar for HORDE
-Summary(pl):	Kronolith - kalendarz dla HORDE
-Name:		kronolith
+Summary:	Kronolith - calendar for Horde
+Summary(pl):	Kronolith - kalendarz dla Horde
+Name:		%{_hordeapp}
 Version:	2.0.4
 Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	LGPL
-Vendor:		The Horde Project
 Group:		Applications/WWW
 #Source0:	ftp://ftp.horde.org/pub/kronolith/%{_hordeapp}-h3-%{version}.tar.gz
 Source0:	ftp://ftp.horde.org/pub/kronolith/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
@@ -34,8 +32,8 @@
 %define		_noautoreq	'pear(Horde.*)'
 
 %define		hordedir	/usr/share/horde
-%define		_appdir		%{hordedir}/%{name}
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/chora.spec?r1=1.36&r2=1.37&f=u
    http://cvs.pld-linux.org/SPECS/gollem.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.32&r2=1.33&f=u
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.104&r2=1.105&f=u
    http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.87&r2=1.88&f=u
    http://cvs.pld-linux.org/SPECS/ingo.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/klutz.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/kronolith.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/mimp.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/mnemo.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/trean.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/turba.spec?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/SPECS/whups.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/wicked.spec?r1=1.7&r2=1.8&f=u

More information about the pld-cvs-commit mailing list