SPECS: horde-turba.spec - update to 2.2rc2, unify macros

[glen]

Author: glen                         Date: Wed Feb  6 23:06:01 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 2.2rc2, unify macros

---- Files affected:
SPECS:
   horde-turba.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.90 SPECS/horde-turba.spec:1.91
--- SPECS/horde-turba.spec:1.90	Wed Feb  6 22:18:50 2008
+++ SPECS/horde-turba.spec	Thu Feb  7 00:05:56 2008
@@ -1,23 +1,23 @@
 # $Revision$, $Date$
-%define	_hordeapp turba
-#define	_snap	2005-10-17
-%define	_rc		rc1
-%define	_rel	3
+%define		hordeapp turba
+#define		_snap	2005-10-17
+%define		subver	rc2
+%define		_rel	1
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Turba - Address book for IMP
 Summary(pl.UTF-8):	Turba - Książka adresowa dla IMP-a
-Name:		horde-%{_hordeapp}
+Name:		horde-%{hordeapp}
 Version:	2.2
-Release:	%{?_rc:0.%{_rc}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
+Release:	%{?subver:0.%{subver}.}%{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 License:	ASL
 Group:		Applications/WWW
-#Source0:	ftp://ftp.horde.org/pub/turba/%{_hordeapp}-h3-%{version}.tar.gz
-Source0:	ftp://ftp.horde.org/pub/turba/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
-# Source0-md5:	825097517a49bfe136197534451aa005
-#Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{_hordeapp}-HEAD-%{_snap}.tar.gz
-Source1:	%{_hordeapp}.conf
-Source2:	%{_hordeapp}-trans.mo
+#Source0:	ftp://ftp.horde.org/pub/turba/%{hordeapp}-h3-%{version}.tar.gz
+Source0:	ftp://ftp.horde.org/pub/turba/%{hordeapp}-h3-%{version}-%{subver}.tar.gz
+# Source0-md5:	a1d29c012fa17c138633a5bfad3fed70
+#Source0:	ftp://ftp.horde.org/pub/snaps/%{_snap}/%{hordeapp}-HEAD-%{_snap}.tar.gz
+Source1:	%{hordeapp}.conf
+Source2:	%{hordeapp}-trans.mo
 URL:		http://www.horde.org/turba/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.304
@@ -27,7 +27,7 @@
 Requires:	php(xml)
 Requires:	php-common >= 3:4.1.0
 Requires:	webapps
-Obsoletes:	%{_hordeapp}
+Obsoletes:	%{hordeapp}
 Obsoletes:	horde-addons-turba
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,10 +37,10 @@
 %define		_noautoreq	'pear(Horde.*)' 'pear(Net/IMSP.php)' 'pear(Net/IMSP/Utils.php)'
 
 %define		hordedir	/usr/share/horde
-%define		_appdir		%{hordedir}/%{_hordeapp}
+%define		_appdir		%{hordedir}/%{hordeapp}
 %define		schemadir	/usr/share/openldap/schema
 %define		_webapps	/etc/webapps
-%define		_webapp		horde-%{_hordeapp}
+%define		_webapp		horde-%{hordeapp}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 
 %description
@@ -83,7 +83,7 @@
 schemat rfc2739.schema z <http://www.whitemiceconsulting.com/node/42>.
 
 %prep
-%setup -qcT -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
+%setup -qcT -n %{?_snap:%{hordeapp}-%{_snap}}%{!?_snap:%{hordeapp}-%{version}%{?subver:-%{subver}}}
 tar zxf %{SOURCE0} --strip-components=1
 
 rm */.htaccess
@@ -188,6 +188,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2008-02-06 23:05:56  glen
+- update to 2.2rc2, unify macros
+
 Revision 1.90  2008-02-06 21:18:50  glen
 - rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-turba.spec?r1=1.90&r2=1.91&f=u