packages: horde/horde.spec, horde/README.PLD (NEW) - moved README.PLD to se...

glen glen at pld-linux.org
Mon Feb 14 08:35:39 CET 2011


Author: glen                         Date: Mon Feb 14 07:35:39 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved README.PLD to separate file, sort deps

---- Files affected:
packages/horde:
   horde.spec (1.187 -> 1.188) , README.PLD (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/horde/horde.spec
diff -u packages/horde/horde.spec:1.187 packages/horde/horde.spec:1.188
--- packages/horde/horde.spec:1.187	Mon Feb 14 08:33:00 2011
+++ packages/horde/horde.spec	Mon Feb 14 08:35:34 2011
@@ -24,6 +24,7 @@
 # Source0-md5:	ee6aee3ab7891913f6faf615f37748e3
 Source1:	%{name}.conf
 Source2:	%{name}-lighttpd.conf
+Source3:	README.PLD
 Patch0:		%{name}-path.patch
 Patch1:		%{name}-shell.disabled.patch
 Patch3:		%{name}-blank-admins.patch
@@ -34,26 +35,26 @@
 Patch8:		%{name}-crypt-detect.patch
 URL:		http://www.horde.org/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
-BuildRequires:	rpmbuild(macros) >= 1.304
+BuildRequires:	rpmbuild(macros) >= 1.595
 %if %{with autodeps}
 BuildRequires:	php-pear-Crypt_Rc4
-BuildRequires:	php-pear-Date
 BuildRequires:	php-pear-DB
+BuildRequires:	php-pear-Date
 BuildRequires:	php-pear-File
 BuildRequires:	php-pear-File_Fstab
 BuildRequires:	php-pear-HTTP_Request
 BuildRequires:	php-pear-HTTP_WebDAV_Server
 BuildRequires:	php-pear-Log
+BuildRequires:	php-pear-MDB2
+BuildRequires:	php-pear-MDB2_Schema
 BuildRequires:	php-pear-Mail
 BuildRequires:	php-pear-Mail_Mime
 BuildRequires:	php-pear-Mail_mimeDecode
-BuildRequires:	php-pear-MDB2
-BuildRequires:	php-pear-MDB2_Schema
 BuildRequires:	php-pear-Net_IMAP
 BuildRequires:	php-pear-Net_SMPP_Client
 BuildRequires:	php-pear-PEAR
-BuildRequires:	php-pear-Services_Weather
 BuildRequires:	php-pear-SOAP
+BuildRequires:	php-pear-Services_Weather
 BuildRequires:	php-pear-Text_CAPTCHA
 BuildRequires:	php-pear-Text_Figlet
 BuildRequires:	php-pear-VFS
@@ -61,9 +62,6 @@
 %endif
 Requires(triggerpostun):	grep
 Requires(triggerpostun):	sed >= 4.0
-Requires:	php-pear-Log
-Requires:	php-pear-Mail
-Requires:	php-pear-Mail_Mime
 Requires:	php(domxml)
 Requires:	php(gd)
 Requires:	php(gettext)
@@ -76,13 +74,16 @@
 Requires:	php(session)
 Requires:	php(xml)
 Requires:	php(zlib)
-Requires:	webserver(php) >= 4.1.0
+Requires:	php-pear-Log
+Requires:	php-pear-Mail
+Requires:	php-pear-Mail_Mime
 Requires:	webapps
+Requires:	webserver(php) >= 4.1.0
 # Suggests: smtpserver(for /usr/lib/sendmail) || smtp server
 Suggests:	dpkg
 Suggests:	enscript
-Suggests:	php-pear-Date
 Suggests:	php-pear-DB >= 1.7.8
+Suggests:	php-pear-Date
 Suggests:	php-pear-File
 Suggests:	php-pear-HTTP_WebDAV_Server
 Suggests:	php-pear-Net_DNS
@@ -170,6 +171,8 @@
 %patch7 -p1
 %patch8 -p1
 
+cp -p %{SOURCE3} .
+
 rm -f {,*/}.htaccess
 for i in config/*.dist; do
 	mv $i config/$(basename $i .dist)
@@ -189,32 +192,6 @@
 exit 1
 %endif
 
-cat > README.PLD << 'EOF'
-IMPORTANT:
-Default horde installation will auto authorize You as Administrator, but due to
-security concerns the Administrator is not granted Administrator privileges.
-If You want to add Yourself to admins list (to administer Horde via web
-interface), please change %{_sysconfdir}/conf.php:
-$conf['auth']['admins'] = array('Administrator');
-
-Depending on authorization You choose, You need to create Horde database tables.
-Look into directory %{_docdir}/%{name}-%{version}/scripts/sql
-to find out how to do this for Your database.
-
-If You've chosen LDAP authorization, please install php-ldap package.
-To configure your openldap server to use horde schema, install
-openldap-schema-horde package.
-
-NOTE: You don't need SQL database for Authorization if You use LDAP for authorization.
-
-If you want to use MaxMind GeoIP Hostname Country lookup, install
-GeoIP package and go to:
-
-Configuration -> Horde -> Hostname -> Country Lookup and set GeoIP.dat path to: %{_datadir}/GeoIP/GeoIP.dat
-
-EOF
-# '
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs,/var/{lib,log}/horde,%{schemadir}}
@@ -245,8 +222,7 @@
 	install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak
 fi
 
-if [ "$1" = 1 ]; then
-%banner %{name} -e <<'EOF'
+%banner -o %{name} -e <<'EOF'
 Please read README.PLD from documentation.
 EOF
 
@@ -350,6 +326,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2011/02/14 07:35:34  glen
+- moved README.PLD to separate file, sort deps
+
 Revision 1.187  2011/02/14 07:33:00  glen
 - don't package tests
 

================================================================
Index: packages/horde/README.PLD
diff -u /dev/null packages/horde/README.PLD:1.1
--- /dev/null	Mon Feb 14 08:35:39 2011
+++ packages/horde/README.PLD	Mon Feb 14 08:35:34 2011
@@ -0,0 +1,22 @@
+IMPORTANT:
+Default horde installation will auto authorize You as Administrator, but due to
+security concerns the Administrator is not granted Administrator privileges.
+If You want to add Yourself to admins list (to administer Horde via web
+interface), please change /etc/webapps/horde/conf.php:
+$conf['auth']['admins'] = array('Administrator');
+
+Depending on authorization You choose, You need to create Horde database tables.
+Look into directory /usr/share/doc/horde-3.3.11/scripts/sql
+to find out how to do this for Your database.
+
+If You've chosen LDAP authorization, please install php-ldap package.
+To configure your openldap server to use horde schema, install
+openldap-schema-horde package.
+
+NOTE: You don't need SQL database for Authorization if You use LDAP for authorization.
+
+If you want to use MaxMind GeoIP Hostname Country lookup, install
+GeoIP package and go to:
+
+Configuration -> Horde -> Hostname -> Country Lookup and set GeoIP.dat path to: /usr/share/GeoIP/GeoIP.dat
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde.spec?r1=1.187&r2=1.188&f=u



More information about the pld-cvs-commit mailing list