template-specs: horde.spec - modernized

glen glen at pld-linux.org
Thu Sep 30 22:22:48 CEST 2010


Author: glen                         Date: Thu Sep 30 20:22:48 2010 GMT
Module: template-specs                Tag: HEAD
---- Log message:
- modernized

---- Files affected:
template-specs:
   horde.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: template-specs/horde.spec
diff -u template-specs/horde.spec:1.17 template-specs/horde.spec:1.18
--- template-specs/horde.spec:1.17	Thu Sep 30 22:07:41 2010
+++ template-specs/horde.spec	Thu Sep 30 22:22:43 2010
@@ -17,14 +17,14 @@
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/skeleton/%{hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	-
-Source1:	%{hordeapp}.conf
-Patch0:		%{hordeapp}-prefs.patch
+Source1:	apache.conf
+Patch0:		prefs.patch
 URL:		http://www.horde.org/skeleton/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.264
-Requires:	apache(mod_access)
 Requires:	horde >= 3.0
 Requires:	webapps
+Requires:	webserver(access)
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,6 +53,7 @@
 
 %prep
 %setup -q -n %{hordeapp}-h3-%{version}
+%patch0 -p1
 
 rm {,*/}.htaccess
 for i in config/*.dist; do
@@ -81,17 +82,17 @@
 
 %post
 if [ ! -f %{_sysconfdir}/conf.php.bak ]; then
-	install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak
+	install /dev/null -o root -g http -m 0660 %{_sysconfdir}/conf.php.bak
 fi
 
 # CHECK FIRST DOES IT HAVE SQL AND FILE THERE.
 if [ "$1" = 1 ]; then
-%banner %{name} -e <<-EOF
+	%banner %{name} -e <<-EOF
 	IMPORTANT:
 	If you are installing Skeleton for the first time, You may need to
 	create the Skeleton database tables. To do so run:
 	zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{hordeapp}.sql.gz | mysql horde
-EOF
+	EOF
 fi
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base
@@ -132,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/09/30 20:22:43  glen
+- modernized
+
 Revision 1.17  2010/09/30 20:07:41  glen
 - bring up to date
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/template-specs/horde.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list