SPECS: horde-chora.spec, horde-giapeto.spec, horde-gollem.spec, ho...
glen
glen at pld-linux.org
Tue Feb 14 21:12:16 CET 2006
Author: glen Date: Tue Feb 14 20:12:16 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- drop apache specific requires
- cosmetics
---- Files affected:
SPECS:
horde-chora.spec (1.52 -> 1.53) , horde-giapeto.spec (1.14 -> 1.15) , horde-gollem.spec (1.27 -> 1.28) , horde-imp.spec (1.109 -> 1.110) , horde-ingo.spec (1.24 -> 1.25) , horde-jonah.spec (1.12 -> 1.13) , horde-klutz.spec (1.17 -> 1.18) , horde-kronolith.spec (1.40 -> 1.41) , horde-mimp.spec (1.22 -> 1.23) , horde-mnemo.spec (1.20 -> 1.21) , horde-nag.spec (1.23 -> 1.24) , horde-passwd.spec (1.47 -> 1.48) , horde-trean.spec (1.18 -> 1.19) , horde-turba.spec (1.69 -> 1.70) , horde-ulaform.spec (1.11 -> 1.12) , horde-vacation.spec (1.4 -> 1.5) , horde-whups.spec (1.22 -> 1.23) , horde-wicked.spec (1.19 -> 1.20) , horde.spec (1.142 -> 1.143)
---- Diffs:
================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.52 SPECS/horde-chora.spec:1.53
--- SPECS/horde-chora.spec:1.52 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-chora.spec Tue Feb 14 21:12:09 2006
@@ -20,13 +20,11 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
# well. depending on configuration, it needs cvs, rcs or svn, cvsps >= 2.0b6
Requires: cvs
Requires: horde >= 3.0
Requires: rcs
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -79,8 +77,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -156,6 +154,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.53 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.52 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.14 SPECS/horde-giapeto.spec:1.15
--- SPECS/horde-giapeto.spec:1.14 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-giapeto.spec Tue Feb 14 21:12:09 2006
@@ -19,10 +19,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -81,8 +79,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -92,13 +90,13 @@
install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak
fi
-# CHECK FIRST DOES IT HAVE SQL AND FILE THERE.
if [ "$1" = 1 ]; then
%banner %{name} -e <<-EOF
IMPORTANT:
If you are installing Giapeto for the first time, You may need to
create the Giapeto database tables. To do so run:
- zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{_hordeapp}.sql.gz | mysql horde
+ zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{_hordeapp}_stats.sql.gz | mysql horde
+ zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{_hordeapp}_bookmarks.sql.gz | mysql horde
EOF
fi
@@ -169,6 +167,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.14 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.27 SPECS/horde-gollem.spec:1.28
--- SPECS/horde-gollem.spec:1.27 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-gollem.spec Tue Feb 14 21:12:09 2006
@@ -21,7 +21,6 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
Obsoletes: %{_hordeapp}
@@ -83,8 +82,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -159,6 +158,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.27 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.109 SPECS/horde-imp.spec:1.110
--- SPECS/horde-imp.spec:1.109 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-imp.spec Tue Feb 14 21:12:09 2006
@@ -25,12 +25,10 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: php-ctype
Requires: php-imap
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -94,8 +92,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -191,6 +189,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.110 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.109 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.24 SPECS/horde-ingo.spec:1.25
--- SPECS/horde-ingo.spec:1.24 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-ingo.spec Tue Feb 14 21:12:09 2006
@@ -21,10 +21,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -90,8 +88,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -164,6 +162,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.24 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-jonah.spec
diff -u SPECS/horde-jonah.spec:1.12 SPECS/horde-jonah.spec:1.13
--- SPECS/horde-jonah.spec:1.12 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-jonah.spec Tue Feb 14 21:12:09 2006
@@ -19,11 +19,9 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.264
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: php-mysql
Requires: webapps
-Requires: webserver = apache
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,8 +72,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -168,6 +166,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.13 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.12 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.17 SPECS/horde-klutz.spec:1.18
--- SPECS/horde-klutz.spec:1.17 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-klutz.spec Tue Feb 14 21:12:09 2006
@@ -21,10 +21,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -78,8 +76,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -164,6 +162,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.17 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.40 SPECS/horde-kronolith.spec:1.41
--- SPECS/horde-kronolith.spec:1.40 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-kronolith.spec Tue Feb 14 21:12:09 2006
@@ -20,11 +20,9 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: php-xml >= 3:4.1.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -92,8 +90,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -177,6 +175,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.41 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.40 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-mimp.spec
diff -u SPECS/horde-mimp.spec:1.22 SPECS/horde-mimp.spec:1.23
--- SPECS/horde-mimp.spec:1.22 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-mimp.spec Tue Feb 14 21:12:09 2006
@@ -21,10 +21,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,7 +84,7 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -161,6 +159,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.22 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.20 SPECS/horde-mnemo.spec:1.21
--- SPECS/horde-mnemo.spec:1.20 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-mnemo.spec Tue Feb 14 21:12:09 2006
@@ -21,10 +21,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,8 +80,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -166,6 +164,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.20 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.23 SPECS/horde-nag.spec:1.24
--- SPECS/horde-nag.spec:1.23 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-nag.spec Tue Feb 14 21:12:09 2006
@@ -21,10 +21,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -78,8 +76,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -162,6 +160,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.24 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.23 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.47 SPECS/horde-passwd.spec:1.48
--- SPECS/horde-passwd.spec:1.47 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-passwd.spec Tue Feb 14 21:12:09 2006
@@ -21,11 +21,9 @@
BuildRequires: rpmbuild(macros) >= 1.264
BuildRequires: tar >= 1:1.15.1
Requires(post): sed >= 4.0
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: php-xml >= 4.1.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: horde-addons-passwd
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,8 +73,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -166,6 +164,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.48 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.47 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-trean.spec
diff -u SPECS/horde-trean.spec:1.18 SPECS/horde-trean.spec:1.19
--- SPECS/horde-trean.spec:1.18 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-trean.spec Tue Feb 14 21:12:09 2006
@@ -19,11 +19,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
-# docs say it requires 3.1, but seems work in 3.0 too
-Requires: horde >= 3.0
+Requires: horde >= 3.1
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -84,8 +81,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
@@ -167,6 +164,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.18 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.69 SPECS/horde-turba.spec:1.70
--- SPECS/horde-turba.spec:1.69 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-turba.spec Tue Feb 14 21:12:09 2006
@@ -23,11 +23,9 @@
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
Requires(triggerpostun): sed >= 4.0
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: php-xml >= 3:4.1.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
Obsoletes: horde-addons-turba
BuildArch: noarch
@@ -106,8 +104,8 @@
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
ln -s %{_docdir}/%{name}-%{version}/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
install %{SOURCE2} $RPM_BUILD_ROOT%{_appdir}/locale/pl_PL/LC_MESSAGES/turba.mo
@@ -147,21 +145,17 @@
' /etc/openldap/slapd.conf
fi
-if [ -f /var/lock/subsys/ldap ]; then
- /etc/rc.d/init.d/ldap restart >&2
-fi
+%service -q ldap restart
%postun -n openldap-schema-rfc2739
if [ "$1" = "0" ]; then
if grep -q %{schemadir}/rfc2739.schema /etc/openldap/slapd.conf; then
sed -i -e '
- /^include.*\/usr\/share\/openldap\/schema\/rfc2739.schema/d
+ /^include.*\/''usr\/share\/openldap\/schema\/rfc2739.schema/d
' /etc/openldap/slapd.conf
fi
- if [ -f /var/lock/subsys/ldap ]; then
- /etc/rc.d/init.d/ldap restart >&2 || :
- fi
+ %service -q ldap restart
fi
%triggerin -- apache1
@@ -244,6 +238,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.70 2006/02/14 20:12:09 glen
+- drop apache specific requires
+- cosmetics
+
Revision 1.69 2006/02/14 19:59:48 glen
- unify (%verify attrs for webserver configs)
================================================================
Index: SPECS/horde-ulaform.spec
diff -u SPECS/horde-ulaform.spec:1.11 SPECS/horde-ulaform.spec:1.12
--- SPECS/horde-ulaform.spec:1.11 Tue Feb 14 20:59:48 2006
+++ SPECS/horde-ulaform.spec Tue Feb 14 21:12:09 2006
@@ -19,10 +19,8 @@
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tar >= 1:1.15.1
-Requires: apache(mod_access)
Requires: horde >= 3.0
Requires: webapps
-Requires: webserver = apache
Obsoletes: %{_hordeapp}
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -101,8 +99,8 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.52&r2=1.53&f=u
http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.27&r2=1.28&f=u
http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.109&r2=1.110&f=u
http://cvs.pld-linux.org/SPECS/horde-ingo.spec?r1=1.24&r2=1.25&f=u
http://cvs.pld-linux.org/SPECS/horde-jonah.spec?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.40&r2=1.41&f=u
http://cvs.pld-linux.org/SPECS/horde-mimp.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.23&r2=1.24&f=u
http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.47&r2=1.48&f=u
http://cvs.pld-linux.org/SPECS/horde-trean.spec?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.69&r2=1.70&f=u
http://cvs.pld-linux.org/SPECS/horde-ulaform.spec?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/SPECS/horde-vacation.spec?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.22&r2=1.23&f=u
http://cvs.pld-linux.org/SPECS/horde-wicked.spec?r1=1.19&r2=1.20&f=u
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.142&r2=1.143&f=u
More information about the pld-cvs-commit
mailing list