SPECS: horde-chora.spec, horde-forwards.spec, horde-jeta.spec, horde-passwd...

baggins baggins at pld-linux.org
Thu Oct 9 23:56:43 CEST 2008 

Author: baggins                      Date: Thu Oct  9 21:56:43 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed unreadable tangle of macros and ugly hacks

---- Files affected:
SPECS:
   horde-chora.spec (1.63 -> 1.64) , horde-forwards.spec (1.10 -> 1.11) , horde-jeta.spec (1.10 -> 1.11) , horde-passwd.spec (1.58 -> 1.59) , horde-vacation.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.63 SPECS/horde-chora.spec:1.64
--- SPECS/horde-chora.spec:1.63	Thu Mar 27 14:48:05 2008
+++ SPECS/horde-chora.spec	Thu Oct  9 23:56:36 2008
@@ -1,17 +1,14 @@
 # $Revision$, $Date$
 %define	_hordeapp	chora
-#define	_rc		rc1
-%define	rel	6
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Web Based CVS Program
 Summary(pl.UTF-8):	Program do obsługi CVS przez WWW
 Name:		horde-%{_hordeapp}
 Version:	2.0.2
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{rel}
+Release:	6
 License:	GPL v2
 Group:		Applications/WWW
-#Source0:	ftp://ftp.horde.org/pub/chora/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
 Source0:	ftp://ftp.horde.org/pub/chora/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	dfddec61103e4437b5ad773888ae55c2
 Source1:	%{_hordeapp}.conf
@@ -56,8 +53,7 @@
 do IMP-a) zajrzyj na stronę <http://www.horde.org/>.
 
 %prep
-%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
-tar zxf %{SOURCE0} --strip-components=1
+%setup -q
 %patch0 -p1
 
 rm {,*/}.htaccess
@@ -154,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2008/10/09 21:56:36  baggins
+- removed unreadable tangle of macros and ugly hacks
+
 Revision 1.63  2008/03/27 13:48:05  glen
 - release 6
 

================================================================
Index: SPECS/horde-forwards.spec
diff -u SPECS/horde-forwards.spec:1.10 SPECS/horde-forwards.spec:1.11
--- SPECS/horde-forwards.spec:1.10	Thu Sep 13 13:10:08 2007
+++ SPECS/horde-forwards.spec	Thu Oct  9 23:56:36 2008
@@ -1,18 +1,14 @@
 # $Revision$, $Date$
 %define		_hordeapp	forwards
-#define		_snap	2005-09-10
-#define		_rc		rc1
-%define		_rel	2
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	forwards - user e-mail forwards module for Horde
 Summary(pl.UTF-8):	forwards - moduł do ustawiania przekazywania poczty w Horde
 Name:		horde-%{_hordeapp}
 Version:	3.0.1
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	2
 License:	ASL
 Group:		Applications/WWW
-#Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 Source0:	ftp://ftp.horde.org/pub/forwards/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	0a2c16b1ff7ea80a246610d6e3ce6b50
 Source1:	%{name}.conf
@@ -57,8 +53,7 @@
 SQL, Exim LDAP, Custom SQL i SOAP.
 
 %prep
-%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
-tar zxf %{SOURCE0} --strip-components=1
+%setup -q
 
 rm -f {,*/}.htaccess
 # considered harmful (horde/docs/SECURITY)
@@ -133,6 +128,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008/10/09 21:56:36  baggins
+- removed unreadable tangle of macros and ugly hacks
+
 Revision 1.10  2007/09/13 11:10:08  baggins
 - rel 2
 

================================================================
Index: SPECS/horde-jeta.spec
diff -u SPECS/horde-jeta.spec:1.10 SPECS/horde-jeta.spec:1.11
--- SPECS/horde-jeta.spec:1.10	Wed Aug  1 13:41:07 2007
+++ SPECS/horde-jeta.spec	Thu Oct  9 23:56:36 2008
@@ -2,22 +2,17 @@
 # TODO
 # - lighttpd support
 %define	_hordeapp jeta
-#define	_snap	2006-08-06
-#define	_rc		rc1
-%define	_rel	2
 
 %include	/usr/lib/rpm/macros.php
 Summary:	Wrapper around the Java Telnet App
 Summary(pl.UTF-8):	Wrapper dla Java Telnet App
 Name:		horde-%{_hordeapp}
 Version:	1.0
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	2
 License:	GPL v2 (CHECK IT FIRST, could be ASL)
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/jeta/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	674449d79e603db2fa88c6de8882ccd4
-#Source0:	ftp://ftp.horde.org/pub/jeta/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
-#Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 Source1:	%{_hordeapp}.conf
 URL:		http://www.horde.org/jeta/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
@@ -50,8 +45,7 @@
 programu przekazującego).
 
 %prep
-%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
-tar zxf %{SOURCE0} --strip-components=1
+%setup -q
 
 rm config/.htaccess lib/.htaccess
 for i in config/*.dist; do
@@ -123,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2008/10/09 21:56:36  baggins
+- removed unreadable tangle of macros and ugly hacks
+
 Revision 1.10  2007/08/01 11:41:07  paszczus
 - rel 2
 

================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.58 SPECS/horde-passwd.spec:1.59
--- SPECS/horde-passwd.spec:1.58	Wed Aug  1 13:58:22 2007
+++ SPECS/horde-passwd.spec	Thu Oct  9 23:56:36 2008
@@ -1,21 +1,16 @@
 # $Revision$, $Date$
 %define		_hordeapp	passwd
-#define		_snap	2005-09-10
-#define		_rc		rc1
-%define		_rel	2
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	passwd - password change module for Horde
 Summary(pl.UTF-8):	passwd - moduł do zmieniania haseł w Horde
 Name:		horde-%{_hordeapp}
 Version:	3.0.1
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	2
 License:	ASL
 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}.tar.gz
 # Source0-md5:	b5217a62c7a88e2845d382a1d19d5644
-#Source0:	ftp://ftp.horde.org/pub/passwd/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
 Source1:	%{name}.conf
 URL:		http://www.horde.org/passwd/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
@@ -52,8 +47,7 @@
 moduł.
 
 %prep
-%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
-tar zxf %{SOURCE0} --strip-components=1
+%setup -q
 
 rm -f {,*/}.htaccess
 for i in config/*.dist; do
@@ -166,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2008/10/09 21:56:36  baggins
+- removed unreadable tangle of macros and ugly hacks
+
 Revision 1.58  2007/08/01 11:58:22  paszczus
 - removed bogus chars
 

================================================================
Index: SPECS/horde-vacation.spec
diff -u SPECS/horde-vacation.spec:1.18 SPECS/horde-vacation.spec:1.19
--- SPECS/horde-vacation.spec:1.18	Wed Aug  1 13:41:07 2007
+++ SPECS/horde-vacation.spec	Thu Oct  9 23:56:37 2008
@@ -1,21 +1,16 @@
 # $Revision$, $Date$
 %define		_hordeapp	vacation
-#define		_snap	2006-07-19
-#define		_rc		rc1
-%define		_rel	2
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	vacation - vacation manager module for Horde
 Summary(pl.UTF-8):	vacation - moduł zarządzania wakacjami dla Horde
 Name:		horde-%{_hordeapp}
 Version:	3.0.1
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:1.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	2
 License:	ASL
 Group:		Applications/WWW
-#Source0:	http://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
 Source0:	ftp://ftp.horde.org/pub/vacation/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	3076da56811855c58a39b929219ea13a
-#Source0:	ftp://ftp.horde.org/pub/vacation/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
 Source1:	%{name}.conf
 Patch0:		horde-vacation-conf.patch
 URL:		http://www.horde.org/vacation/
@@ -63,8 +58,7 @@
 ulepszenia modułu.
 
 %prep
-%setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
-tar zxf %{SOURCE0} --strip-components=1
+%setup -q
 %patch0 -p1
 
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -166,6 +160,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2008/10/09 21:56:37  baggins
+- removed unreadable tangle of macros and ugly hacks
+
 Revision 1.18  2007/08/01 11:41:07  paszczus
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-chora.spec?r1=1.63&r2=1.64&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-forwards.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-jeta.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-passwd.spec?r1=1.58&r2=1.59&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-vacation.spec?r1=1.18&r2=1.19&f=u

More information about the pld-cvs-commit mailing list