SPECS: horde-nag.spec - update to 2.2rc2, unify macros, drop old t...

[glen]

Author: glen                         Date: Wed Feb  6 23:16:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 2.2rc2, unify macros, drop old trigger

---- Files affected:
SPECS:
   horde-nag.spec (1.38 -> 1.39) 

---- Diffs:

================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.38 SPECS/horde-nag.spec:1.39
--- SPECS/horde-nag.spec:1.38	Sun Jan 13 11:03:22 2008
+++ SPECS/horde-nag.spec	Thu Feb  7 00:16:52 2008
@@ -1,29 +1,29 @@
 # $Revision$, $Date$
-%define	_hordeapp nag
-#define	_snap	2005-08-01
-%define	_rc		rc1
-%define	_rel	1
+%define		hordeapp nag
+#define		_snap	2005-08-01
+%define		subver		rc2
+%define		rel	1
 #
 %include	/usr/lib/rpm/macros.php
 Summary:	Nag Task List Manager
 Summary(pl.UTF-8):	Nag - zarządca list zadań
-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:	GPL v2
 Group:		Applications/WWW
-#Source0:	ftp://ftp.horde.org/pub/nag/%{_hordeapp}-h3-%{version}.tar.gz
-Source0:	ftp://ftp.horde.org/pub/nag/%{_hordeapp}-h3-%{version}-%{_rc}.tar.gz
-# Source0-md5:	28778e1af471bd2353a01407cf75ab05
-Source1:	%{_hordeapp}.conf
-Patch0:		%{_hordeapp}-prefs.patch
+#Source0:	ftp://ftp.horde.org/pub/nag/%{hordeapp}-h3-%{version}.tar.gz
+Source0:	ftp://ftp.horde.org/pub/nag/%{hordeapp}-h3-%{version}-%{subver}.tar.gz
+# Source0-md5:	2d2cfbde4a1e792eaeeb655489c3a5ab
+Source1:	%{hordeapp}.conf
+Patch0:		%{hordeapp}-prefs.patch
 URL:		http://www.horde.org/nag/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	tar >= 1:1.15.1
 Requires:	horde >= 3.0
 Requires:	webapps
-Obsoletes:	%{_hordeapp}
+Obsoletes:	%{hordeapp}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,9 +32,9 @@
 %define		_noautoreq	'pear(Horde.*)'
 
 %define		hordedir	/usr/share/horde
-%define		_appdir		%{hordedir}/%{_hordeapp}
+%define		_appdir		%{hordedir}/%{hordeapp}
 %define		_webapps	/etc/webapps
-%define		_webapp		horde-%{_hordeapp}
+%define		_webapp		horde-%{hordeapp}
 %define		_sysconfdir	%{_webapps}/%{_webapp}
 
 %description
@@ -56,7 +56,7 @@
 można znaleźć na stronie <http://www.horde.org/>.
 
 %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
 
 for i in config/*.dist; do
@@ -92,7 +92,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/%{_hordeapp}.sql.gz | mysql horde
+zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{hordeapp}.sql.gz | mysql horde
 EOF
 fi
 
@@ -108,32 +108,6 @@
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- horde-%{_hordeapp} < 2.0.3-1.1, %{_hordeapp}
-for i in conf.php menu.php prefs.php; do
-	if [ -f /etc/horde.org/%{_hordeapp}/$i.rpmsave ]; then
-		mv -f %{_sysconfdir}/$i{,.rpmnew}
-		mv -f /etc/horde.org/%{_hordeapp}/$i.rpmsave %{_sysconfdir}/$i
-	fi
-done
-
-if [ -f /etc/horde.org/apache-%{_hordeapp}.conf.rpmsave ]; then
-	mv -f %{_sysconfdir}/apache.conf{,.rpmnew}
-	mv -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-	cp -f /etc/horde.org/apache-%{_hordeapp}.conf.rpmsave %{_sysconfdir}/apache.conf
-	cp -f /etc/horde.org/apache-%{_hordeapp}.conf.rpmsave %{_sysconfdir}/httpd.conf
-fi
-
-rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.conf
-if [ -d /etc/apache/webapps.d ]; then
-	/usr/sbin/webapp register apache %{_webapp}
-	%service -q apache reload
-fi
-rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
-if [ -d /etc/httpd/webapps.d ]; then
-	/usr/sbin/webapp register httpd %{_webapp}
-	%service -q httpd reload
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc README docs/* scripts
@@ -160,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2008-02-06 23:16:52  glen
+- update to 2.2rc2, unify macros, drop old trigger
+
 Revision 1.38  2008-01-13 10:03:22  qboosh
 - restored pl encoding broken by paszczus
 
================================================================

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