SPECS: horde-chora.spec, horde-giapeto.spec, horde-gollem.spec, ho...

glen glen at pld-linux.org
Wed Nov 16 15:17:59 CET 2005


Author: glen                         Date: Wed Nov 16 14:17:59 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified apache virtual requires

---- Files affected:
SPECS:
   horde-chora.spec (1.40 -> 1.41) , horde-giapeto.spec (1.3 -> 1.4) , horde-gollem.spec (1.14 -> 1.15) , horde-imp.spec (1.90 -> 1.91) , horde-ingo.spec (1.10 -> 1.11) , horde-jonah.spec (1.2 -> 1.3) , horde-klutz.spec (1.6 -> 1.7) , horde-kronolith.spec (1.25 -> 1.26) , horde-mnemo.spec (1.8 -> 1.9) , horde-nag.spec (1.9 -> 1.10) , horde-passwd.spec (1.35 -> 1.36) , horde-turba.spec (1.53 -> 1.54) , horde-ulaform.spec (1.2 -> 1.3) , horde-whups.spec (1.12 -> 1.13) , horde-wicked.spec (1.10 -> 1.11) , horde.spec (1.116 -> 1.117) 

---- Diffs:

================================================================
Index: SPECS/horde-chora.spec
diff -u SPECS/horde-chora.spec:1.40 SPECS/horde-chora.spec:1.41
--- SPECS/horde-chora.spec:1.40	Thu Oct 13 19:51:10 2005
+++ SPECS/horde-chora.spec	Wed Nov 16 15:17:51 2005
@@ -19,13 +19,14 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 # well. depending on configuration, it needs cvs, rcs or svn, cvsps >= 2.0b6
 Requires:	cvs
-Requires:	rcs
 Requires:	horde >= 3.0
+Requires:	rcs
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -58,7 +59,7 @@
 tar zxf %{SOURCE0} --strip-components=1
 
 sed -i -e '
-	s,/usr/local/bin/cvsps,/usr/bin/cvsps,
+	s,/''usr/local/bin/cvsps,%{_bindir}/cvsps,
 	s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/%{_hordeapp}/cvsgraph.conf,
 ' config/conf.xml
 
@@ -131,6 +132,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.40  2005/10/13 17:51:10  paszczus
 - updated to FINAL 2.0.1
 

================================================================
Index: SPECS/horde-giapeto.spec
diff -u SPECS/horde-giapeto.spec:1.3 SPECS/horde-giapeto.spec:1.4
--- SPECS/horde-giapeto.spec:1.3	Wed Sep 21 21:15:28 2005
+++ SPECS/horde-giapeto.spec	Wed Nov 16 15:17:51 2005
@@ -19,10 +19,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -144,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.3  2005/09/21 19:15:28  qboosh
 - pl
 

================================================================
Index: SPECS/horde-gollem.spec
diff -u SPECS/horde-gollem.spec:1.14 SPECS/horde-gollem.spec:1.15
--- SPECS/horde-gollem.spec:1.14	Mon Sep 19 23:13:41 2005
+++ SPECS/horde-gollem.spec	Wed Nov 16 15:17:51 2005
@@ -20,10 +20,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -132,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.14  2005/09/19 21:13:41  glen
 - rel 2
 

================================================================
Index: SPECS/horde-imp.spec
diff -u SPECS/horde-imp.spec:1.90 SPECS/horde-imp.spec:1.91
--- SPECS/horde-imp.spec:1.90	Tue Oct 18 10:46:09 2005
+++ SPECS/horde-imp.spec	Wed Nov 16 15:17:51 2005
@@ -24,12 +24,13 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
-Requires:	php-imap
 Requires:	php-ctype
+Requires:	php-imap
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -69,8 +70,8 @@
 %patch0 -p1
 
 sed -i -e '
-	s,/somewhere/ca-bundle.crt,/usr/share/ssl/ca-bundle.crt,
-	s,/usr/local/bin,%{_bindir},
+	s,/somewhere/ca-bundle.crt,/''usr/share/ssl/ca-bundle.crt,
+	s,/''usr/local/bin,%{_bindir},
 ' config/conf.xml
 
 # considered harmful (horde/docs/SECURITY)
@@ -162,6 +163,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.90  2005/10/18 08:46:09  paszczus
 - updated to FINAL 4.0.4
 

================================================================
Index: SPECS/horde-ingo.spec
diff -u SPECS/horde-ingo.spec:1.10 SPECS/horde-ingo.spec:1.11
--- SPECS/horde-ingo.spec:1.10	Sun Oct 16 03:59:14 2005
+++ SPECS/horde-ingo.spec	Wed Nov 16 15:17:51 2005
@@ -20,10 +20,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -137,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.10  2005/10/16 01:59:14  glen
 - Ingo H3 (1.0.2) (final)
 

================================================================
Index: SPECS/horde-jonah.spec
diff -u SPECS/horde-jonah.spec:1.2 SPECS/horde-jonah.spec:1.3
--- SPECS/horde-jonah.spec:1.2	Wed Sep 21 21:47:06 2005
+++ SPECS/horde-jonah.spec	Wed Nov 16 15:17:51 2005
@@ -19,10 +19,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	php-mysql
+Requires:	webserver = apache
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -143,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.2  2005/09/21 19:47:06  qboosh
 - pl
 

================================================================
Index: SPECS/horde-klutz.spec
diff -u SPECS/horde-klutz.spec:1.6 SPECS/horde-klutz.spec:1.7
--- SPECS/horde-klutz.spec:1.6	Sat Sep 17 18:27:33 2005
+++ SPECS/horde-klutz.spec	Wed Nov 16 15:17:51 2005
@@ -21,10 +21,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -137,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.6  2005/09/17 16:27:33  glen
 - renamed horde application packages with horde- prefix
 

================================================================
Index: SPECS/horde-kronolith.spec
diff -u SPECS/horde-kronolith.spec:1.25 SPECS/horde-kronolith.spec:1.26
--- SPECS/horde-kronolith.spec:1.25	Mon Nov 14 10:50:01 2005
+++ SPECS/horde-kronolith.spec	Wed Nov 16 15:17:51 2005
@@ -20,11 +20,12 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	php-xml >= 3:4.1.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -149,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.25  2005/11/14 09:50:01  paszczus
 - updated to 2.0.5
 

================================================================
Index: SPECS/horde-mnemo.spec
diff -u SPECS/horde-mnemo.spec:1.8 SPECS/horde-mnemo.spec:1.9
--- SPECS/horde-mnemo.spec:1.8	Thu Oct 13 22:03:55 2005
+++ SPECS/horde-mnemo.spec	Wed Nov 16 15:17:51 2005
@@ -20,10 +20,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -137,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.8  2005/10/13 20:03:55  paszczus
 - updated to FINAL 2.0.2
 

================================================================
Index: SPECS/horde-nag.spec
diff -u SPECS/horde-nag.spec:1.9 SPECS/horde-nag.spec:1.10
--- SPECS/horde-nag.spec:1.9	Tue Oct 18 10:48:12 2005
+++ SPECS/horde-nag.spec	Wed Nov 16 15:17:51 2005
@@ -20,10 +20,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -50,8 +51,8 @@
 podobna w funkcjonalności do aplikacji Palm ToDo.
 
 Projekt Horde tworzy aplikacje WWW w PHP i wydaje je na licencji GNU
-General Public License. Więcej informacji (włącznie z pomocą dla
-Naga) można znaleźć na stronie <http://www.horde.org/>.
+General Public License. Więcej informacji (włącznie z pomocą dla Naga)
+można znaleźć na stronie <http://www.horde.org/>.
 
 %prep
 %setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
@@ -121,6 +122,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.9  2005/10/18 08:48:12  paszczus
 - updated to 2.0.3
 

================================================================
Index: SPECS/horde-passwd.spec
diff -u SPECS/horde-passwd.spec:1.35 SPECS/horde-passwd.spec:1.36
--- SPECS/horde-passwd.spec:1.35	Sun Oct  9 22:45:23 2005
+++ SPECS/horde-passwd.spec	Wed Nov 16 15:17:51 2005
@@ -21,11 +21,12 @@
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
 Requires(post):	sed >= 4.0
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	php-xml >= 4.1.0
+Requires:	webserver = apache
 Obsoletes:	horde-addons-passwd
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -141,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.35  2005/10/09 20:45:23  glen
 - rel 2
 

================================================================
Index: SPECS/horde-turba.spec
diff -u SPECS/horde-turba.spec:1.53 SPECS/horde-turba.spec:1.54
--- SPECS/horde-turba.spec:1.53	Tue Oct 18 10:43:56 2005
+++ SPECS/horde-turba.spec	Wed Nov 16 15:17:51 2005
@@ -23,12 +23,13 @@
 BuildRequires:	rpmbuild(macros) >= 1.177
 BuildRequires:	tar >= 1:1.15.1
 Requires(triggerpostun):	sed >= 4.0
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	php-xml >= 3:4.1.0
+Requires:	webserver = apache
 Obsoletes:	horde-addons-turba
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -220,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.53  2005/10/18 08:43:56  paszczus
 - updated to FINAL 2.0.4
 

================================================================
Index: SPECS/horde-ulaform.spec
diff -u SPECS/horde-ulaform.spec:1.2 SPECS/horde-ulaform.spec:1.3
--- SPECS/horde-ulaform.spec:1.2	Wed Sep 21 22:15:08 2005
+++ SPECS/horde-ulaform.spec	Wed Nov 16 15:17:51 2005
@@ -19,10 +19,11 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -56,14 +57,14 @@
 
 %description -l pl
 Ulaform to oparty na PHP system tworzenia i generowania dynamicznych
-formularzy HTML. Pozwala użytkownikom tworzyć wymyślne formularze
-przy użyciu przeglądarki WWW, a następnie wyświetlać formularze na
-innych stronach WWW poprzez prostą dyrektywę include PHP wewnątrz
-znacznika <?php ... ?> lub w innych aplikacjach Horde poprzez API
-Horde Block. Ulaform ma za zadanie zastąpić inne techniki generowania
-dynamicznych formularzy (takie jak formularze FrontPage, wymagające
-rozszerzeń FrontPage na serwerze, czy skrypty CGI wymagające
-umiejętności programowania).
+formularzy HTML. Pozwala użytkownikom tworzyć wymyślne formularze przy
+użyciu przeglądarki WWW, a następnie wyświetlać formularze na innych
+stronach WWW poprzez prostą dyrektywę include PHP wewnątrz znacznika
+<?php ... ?> lub w innych aplikacjach Horde poprzez API Horde Block.
+Ulaform ma za zadanie zastąpić inne techniki generowania dynamicznych
+formularzy (takie jak formularze FrontPage, wymagające rozszerzeń
+FrontPage na serwerze, czy skrypty CGI wymagające umiejętności
+programowania).
 
 Ulaform jest oparty na bibliotece Horde_Form ze szkieletu Horde. Daje
 to trochę przydatnych cech: możliwość automatycznego sprawdzania
@@ -158,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.2  2005/09/21 20:15:08  qboosh
 - pl, killed "Skeleton" remains
 

================================================================
Index: SPECS/horde-whups.spec
diff -u SPECS/horde-whups.spec:1.12 SPECS/horde-whups.spec:1.13
--- SPECS/horde-whups.spec:1.12	Sat Sep 17 18:27:33 2005
+++ SPECS/horde-whups.spec	Wed Nov 16 15:17:51 2005
@@ -19,11 +19,12 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	apache >= 1.3.33-2
 Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	php-mysql
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -49,10 +50,10 @@
 zaprojektowany tak, by być skrajnie elastycznym, pozwalając
 użytkownikom definiować rodzaje zgłoszeń, różne cykle życia (zbiory
 stanów) i priorytety dla każdego rodzaju zgłoszenia, a także łączyć
-rodzaje zgłoszeń w zbiory kolejek. Taki sposób zaprojektowania
-pozwala na bardzo ogólne i wymyśle sposoby wykorzystania Whups do
-wielu celów. Kod osiągnął prawie jakość 1.0 i większość możliwości
-jest już w pełni zaimplementowana.
+rodzaje zgłoszeń w zbiory kolejek. Taki sposób zaprojektowania pozwala
+na bardzo ogólne i wymyśle sposoby wykorzystania Whups do wielu celów.
+Kod osiągnął prawie jakość 1.0 i większość możliwości jest już w pełni
+zaimplementowana.
 
 %prep
 %setup -q -c -T -n %{?_snap:%{_hordeapp}-%{_snap}}%{!?_snap:%{_hordeapp}-%{version}%{?_rc:-%{_rc}}}
@@ -140,6 +141,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.12  2005/09/17 16:27:33  glen
 - renamed horde application packages with horde- prefix
 

================================================================
Index: SPECS/horde-wicked.spec
diff -u SPECS/horde-wicked.spec:1.10 SPECS/horde-wicked.spec:1.11
--- SPECS/horde-wicked.spec:1.10	Wed Nov 16 15:01:42 2005
+++ SPECS/horde-wicked.spec	Wed Nov 16 15:17:51 2005
@@ -19,10 +19,10 @@
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.226
 BuildRequires:	tar >= 1:1.15.1
-Requires:	webserver = apache
 Requires:	apache(mod_access)
 # actually it requires horde 3.1, but 3.0 is fine for testing too.
 Requires:	horde >= 3.0
+Requires:	webserver = apache
 Obsoletes:	%{_hordeapp}
 Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
@@ -139,6 +139,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.10  2005/11/16 14:01:42  glen
 - 2005-11-16 snap
 - unified apache virtual requires

================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.116 SPECS/horde.spec:1.117
--- SPECS/horde.spec:1.116	Sat Oct 29 09:43:47 2005
+++ SPECS/horde.spec	Wed Nov 16 15:17:51 2005
@@ -40,7 +40,6 @@
 BuildRequires:	tar >= 1:1.15.1
 Requires(triggerpostun):	grep
 Requires(triggerpostun):	sed >= 4.0
-Requires:	apache >= 1.3.33-3
 Requires:	apache(mod_access)
 Requires:	apache(mod_alias)
 Requires:	apache(mod_dir) >= 1.3.22
@@ -56,8 +55,10 @@
 Requires:	php-session >= 3:4.1.0
 Requires:	php-xml >= 3:4.1.0
 Requires:	php-zlib >= 3:4.1.0
+Requires:	webserver = apache
 Obsoletes:	horde-mysql
 Obsoletes:	horde-pgsql
+Conflicts:	apache < 1.3.33-2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -85,9 +86,8 @@
 wymagany dla wszystkich innych modułów Horde.
 
 Projekt Horde tworzy aplikacje WWW w PHP i wydaje je na licencji GNU
-General Public License. Więcej informacji (włącznie z pomocą dla
-Horde i jego modułów) można znaleźć na stronie
-<http://www.horde.org/>.
+General Public License. Więcej informacji (włącznie z pomocą dla Horde
+i jego modułów) można znaleźć na stronie <http://www.horde.org/>.
 
 %description -l pt_BR
 Este pacote provę uma interface e estrutura comuns para os módulos
@@ -104,8 +104,8 @@
 Summary(pl):	Schemat LDAP dla Horde
 Group:		Networking/Daemons
 Requires(post,postun):	sed >= 4.0
-Requires:	sed >= 4.0
 Requires:	openldap-servers
+Requires:	sed >= 4.0
 
 %description -n openldap-schema-horde
 This package contains horde.schema for openldap.
@@ -338,6 +338,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.117  2005/11/16 14:17:51  glen
+- unified apache virtual requires
+
 Revision 1.116  2005/10/29 07:43:47  paszczus
 - updated to FINAL 3.0.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/horde-chora.spec?r1=1.40&r2=1.41&f=u
    http://cvs.pld-linux.org/SPECS/horde-giapeto.spec?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/SPECS/horde-gollem.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/horde-imp.spec?r1=1.90&r2=1.91&f=u
    http://cvs.pld-linux.org/SPECS/horde-ingo.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/horde-jonah.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/horde-klutz.spec?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/SPECS/horde-kronolith.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/horde-mnemo.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/horde-nag.spec?r1=1.9&r2=1.10&f=u
    http://cvs.pld-linux.org/SPECS/horde-passwd.spec?r1=1.35&r2=1.36&f=u
    http://cvs.pld-linux.org/SPECS/horde-turba.spec?r1=1.53&r2=1.54&f=u
    http://cvs.pld-linux.org/SPECS/horde-ulaform.spec?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SPECS/horde-whups.spec?r1=1.12&r2=1.13&f=u
    http://cvs.pld-linux.org/SPECS/horde-wicked.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.116&r2=1.117&f=u




More information about the pld-cvs-commit mailing list