Author: glen Date: Wed Feb 6 23:11:25 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- update to 2.2rc2, unify macros, drop old trigger
---- Files affected:
SPECS:
horde-kronolith.spec (1.56 -> 1.57)
---- Diffs:
================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.56 SPECS/horde-kronolith.spec:1.57
--- SPECS/horde-kronolith.spec:1.56 Wed Jan 9 17:47:59 2008
+++ SPECS/horde-kronolith.spec Thu Feb 7 00:11:20 2008
@@ -1,21 +1,21 @@
# $Revision$, $Date$
-%define _hordeapp kronolith
-#define _snap 2005-08-01
-%define _rc rc1
-%define _rel 1
+%define hordeapp kronolith
+#define _snap 2005-08-01
+%define subver rc2
+%define rel 1
#
%include /usr/lib/rpm/macros.php
Summary: Kronolith - calendar for Horde
Summary(pl.UTF-8): Kronolith - kalendarz dla Horde
-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: LGPL
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
-# Source0-md5: 0a3e928ddd92503fe8c9339833671fd0
-Source1: %{_hordeapp}.conf
+#Source0:
ftp://ftp.horde.org/pub/kronolith/%{hordeapp}-h3-%{version}.tar.gz
+Source0:
ftp://ftp.horde.org/pub/kronolith/%{hordeapp}-h3-%{version}-%{subver}.tar.gz
+# Source0-md5: 922b11f75d22198d5bef766933a3ce00
+Source1: %{hordeapp}.conf
URL: http://www.horde.org/kronolith/
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
@@ -24,7 +24,7 @@
Requires: php(xml)
Requires: php-common >= 3:4.1.0
Requires: webapps
-Obsoletes: %{_hordeapp}
+Obsoletes: %{hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,9 +33,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
@@ -71,7 +71,7 @@
PostgreSQL, Oracle i MS SQL poprzez PEAR DB), MCAL i Kolab.
%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
@@ -123,32 +123,6 @@
%triggerun -- apache < 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
-%triggerpostun -- horde-%{_hordeapp} < 2.0.4-1.1, %{_hordeapp}
-for i in conf.php keywords.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
-
-if [ -L /etc/apache/conf.d/99_horde-%{_hordeapp}.conf ]; then
- /usr/sbin/webapp register apache %{_webapp}
- rm -f /etc/apache/conf.d/99_horde-%{_hordeapp}.conf
- %service -q apache reload
-fi
-if [ -L /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf ]; then
- /usr/sbin/webapp register httpd %{_webapp}
- rm -f /etc/httpd/httpd.conf/99_horde-%{_hordeapp}.conf
- %service -q httpd reload
-fi
-
%files
%defattr(644,root,root,755)
%doc README docs/* scripts/*
@@ -175,6 +149,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.57 2008-02-06 23:11:20 glen
+- update to 2.2rc2, unify macros, drop old trigger
+
Revision 1.56 2008-01-09 16:47:59 paszczus
- updated to 2.2-rc1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/horde-kronolith.spec?r1=1.56&r2=1.57&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
