packages: horde/README.PLD, horde/horde-lighttpd.conf, horde/horde-mime_dri...
glen
glen at pld-linux.org
Sun Apr 10 23:39:16 CEST 2011
Author: glen Date: Sun Apr 10 21:39:16 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.0.0, uses pear channel to do the releases now
---- Files affected:
packages/horde:
README.PLD (1.1 -> 1.2) , horde-lighttpd.conf (1.1 -> 1.2) , horde-mime_drivers.patch (1.6 -> 1.7) , horde-path.patch (1.20 -> 1.21) , horde-shell.disabled.patch (1.2 -> 1.3) , horde.spec (1.191 -> 1.192)
---- Diffs:
================================================================
Index: packages/horde/README.PLD
diff -u packages/horde/README.PLD:1.1 packages/horde/README.PLD:1.2
--- packages/horde/README.PLD:1.1 Mon Feb 14 08:35:34 2011
+++ packages/horde/README.PLD Sun Apr 10 23:39:10 2011
@@ -6,7 +6,7 @@
$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
+Look into directory /usr/share/doc/horde-*/scripts/sql
to find out how to do this for Your database.
If You've chosen LDAP authorization, please install php-ldap package.
================================================================
Index: packages/horde/horde-lighttpd.conf
diff -u packages/horde/horde-lighttpd.conf:1.1 packages/horde/horde-lighttpd.conf:1.2
--- packages/horde/horde-lighttpd.conf:1.1 Tue Feb 14 18:14:03 2006
+++ packages/horde/horde-lighttpd.conf Sun Apr 10 23:39:10 2011
@@ -1,3 +1,17 @@
alias.url += (
"/horde/" => "/usr/share/horde/",
)
+
+url.rewrite-once += (
+ ## RPC Rewrite Rules
+ "^/horde/rpc/(.*)$" => "/horde/rpc/index.php/$1",
+
+ ## For Routes to work with Content component. Note you should verify
+ ## that the path below is correct for your installation.
+ "^/horde/incubator/content/(.*)\?(.*)$" => "/horde/incubator/content/index.php?$2",
+ "^/horde/incubator/content/(.*)$" => "/horde/incubator/content/index.php"
+)
+
+$HTTP["url"] =~ "(/templates/|(?<!js/syntaxhighlighter)\/scripts/|/lib/|/po/|/locale/|(?<!admin)\/config\/)" {
+ url.access-deny = ("")
+}
================================================================
Index: packages/horde/horde-mime_drivers.patch
diff -u packages/horde/horde-mime_drivers.patch:1.6 packages/horde/horde-mime_drivers.patch:1.7
--- packages/horde/horde-mime_drivers.patch:1.6 Thu Oct 9 16:55:26 2008
+++ packages/horde/horde-mime_drivers.patch Sun Apr 10 23:39:10 2011
@@ -1,38 +1,21 @@
---- horde-3.2-alpha/config/mime_drivers.php.dist~ 2007-08-27 12:44:27.337252725 +0300
-+++ horde-3.2-alpha/config/mime_drivers.php.dist 2007-08-27 12:44:29.067291838 +0300
-@@ -68,7 +68,7 @@
- // 'msword',
- // 'msexcel',
- // 'mspowerpoint',
-- // 'rpm',
-+ 'rpm',
- // 'rtf',
- // 'srchighlite',
- // 'webcpp',
-@@ -403,7 +403,7 @@
- * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
- */
- $mime_drivers['horde']['msexcel'] = array(
-- 'location' => '/usr/local/bin/xlhtml',
-+ 'location' => '/usr/bin/xlhtml',
- 'inline' => false,
- 'handles' => array(
- 'application/vnd.ms-excel', 'application/msexcel',
-@@ -421,7 +421,7 @@
- * xlhtml homepage: http://chicago.sourceforge.net/xlhtml/
- */
- $mime_drivers['horde']['mspowerpoint'] = array(
-- 'location' => '/usr/local/bin/ppthtml',
-+ 'location' => '/usr/bin/ppthtml',
- 'inline' => false,
- 'handles' => array(
- 'application/vnd.ms-powerpoint', 'application/mspowerpoint'
-@@ -449,7 +449,7 @@
- * RPM driver settings
- */
- $mime_drivers['horde']['rpm'] = array(
-- 'location' => '/usr/bin/rpm',
-+ 'location' => '/bin/rpm',
- 'inline' => false,
- 'handles' => array(
- 'application/x-rpm'
+--- horde/config/mime_drivers.php~ 2011-04-09 01:03:15.000000000 +0300
++++ horde/config/mime_drivers.php 2011-04-09 01:04:13.509122695 +0300
+@@ -326,8 +326,7 @@
+
+ /* RPM archive display. */
+ 'rpm' => array(
+- // Disabled by default
+- 'disable' => true,
++ 'disable' => false,
+ 'handles' => array(
+ 'application/x-rpm'
+ ),
+@@ -336,7 +335,7 @@
+ ),
+
+ // REQUIRED: Location of the rpm binary
+- 'location' => '/usr/bin/rpm'
++ 'location' => '/bin/rpm'
+ ),
+
+ /* Debian archive display. */
================================================================
Index: packages/horde/horde-path.patch
diff -u packages/horde/horde-path.patch:1.20 packages/horde/horde-path.patch:1.21
--- packages/horde/horde-path.patch:1.20 Thu Oct 9 16:53:31 2008
+++ packages/horde/horde-path.patch Sun Apr 10 23:39:10 2011
@@ -1,5 +1,5 @@
---- horde-3.3/config/registry.php.dist~ 2008-10-09 16:26:10.000000000 +0200
-+++ horde-3.3/config/registry.php.dist 2008-10-09 16:35:56.000000000 +0200
+--- horde-3.3/config/registry.php~ 2008-10-09 16:26:10.000000000 +0200
++++ horde-3.3/config/registry.php 2008-10-09 16:35:56.000000000 +0200
@@ -44,24 +44,24 @@
// 'horde' stanza below.
================================================================
Index: packages/horde/horde-shell.disabled.patch
diff -u packages/horde/horde-shell.disabled.patch:1.2 packages/horde/horde-shell.disabled.patch:1.3
--- packages/horde/horde-shell.disabled.patch:1.2 Fri Jan 6 16:58:56 2006
+++ packages/horde/horde-shell.disabled.patch Sun Apr 10 23:39:10 2011
@@ -1,34 +1,39 @@
-diff -ur horde-3.1-rc1/lib/api.php horde-3.1-rc1.new/lib/api.php
---- horde-3.1-rc1/lib/api.php 2005-10-18 11:33:39.000000000 +0000
-+++ horde-3.1-rc1.new/lib/api.php 2006-01-06 15:56:02.321528000 +0000
-@@ -144,18 +144,18 @@
- 'link' => '%application%/admin/sessions.php',
- 'name' => _("Sessions"),
- 'icon' => 'user.png'),
-- 'phpshell' => array(
-- 'link' => '%application%/admin/phpshell.php',
-- 'name' => _("P_HP Shell"),
-- 'icon' => 'mime/php.png'),
-- 'sqlshell' => array(
-- 'link' => '%application%/admin/sqlshell.php',
-- 'name' => _("S_QL Shell"),
-- 'icon' => 'sql.png'),
-- 'cmdshell' => array(
-- 'link' => '%application%/admin/cmdshell.php',
-- 'name' => _("_CLI"),
-- 'icon' => 'shell.png'),
-+# 'phpshell' => array(
-+# 'link' => '%application%/admin/phpshell.php',
-+# 'name' => _("P_HP Shell"),
-+# 'icon' => 'shell.png'),
-+# 'sqlshell' => array(
-+# 'link' => '%application%/admin/sqlshell.php',
-+# 'name' => _("S_QL Shell"),
-+# 'icon' => 'sql.png'),
-+# 'cmdshell' => array(
-+# 'link' => '%application%/admin/cmdshell.php',
-+# 'name' => _("_CLI"),
-+# 'icon' => 'shell.png'),
- );
- }
+--- horde/lib/Api.php~ 2011-04-09 01:01:50.000000000 +0300
++++ horde/lib/Api.php 2011-04-09 01:02:19.292467869 +0300
+@@ -57,21 +57,21 @@
+ 'name' => _("Sessions"),
+ 'icon' => Horde_Themes::img('user.png')
+ ),
+- 'phpshell' => array(
+- 'link' => '%application%/admin/phpshell.php',
+- 'name' => _("P_HP Shell"),
+- 'icon' => Horde_Themes::img('mime/php.png')
+- ),
+- 'sqlshell' => array(
+- 'link' => '%application%/admin/sqlshell.php',
+- 'name' => _("S_QL Shell"),
+- 'icon' => Horde_Themes::img('sql.png')
+- ),
+- 'cmdshell' => array(
+- 'link' => '%application%/admin/cmdshell.php',
+- 'name' => _("_CLI"),
+- 'icon' => Horde_Themes::img('shell.png')
+- )
++# 'phpshell' => array(
++# 'link' => '%application%/admin/phpshell.php',
++# 'name' => _("P_HP Shell"),
++# 'icon' => Horde_Themes::img('mime/php.png')
++# ),
++# 'sqlshell' => array(
++# 'link' => '%application%/admin/sqlshell.php',
++# 'name' => _("S_QL Shell"),
++# 'icon' => Horde_Themes::img('sql.png')
++# ),
++# 'cmdshell' => array(
++# 'link' => '%application%/admin/cmdshell.php',
++# 'name' => _("_CLI"),
++# 'icon' => Horde_Themes::img('shell.png')
++# )
+ );
+ if (!empty($GLOBALS['conf']['activesync']['enabled'])) {
================================================================
Index: packages/horde/horde.spec
diff -u packages/horde/horde.spec:1.191 packages/horde/horde.spec:1.192
--- packages/horde/horde.spec:1.191 Fri Apr 8 23:35:17 2011
+++ packages/horde/horde.spec Sun Apr 10 23:39:10 2011
@@ -8,36 +8,71 @@
%define hordeapp horde
%define php_min_version 5.2.0
+%define pearname horde
%include /usr/lib/rpm/macros.php
Summary: The common Horde Framework for all Horde modules
Summary(es.UTF-8): Elementos básicos do Horde Web Application Suite
Summary(pl.UTF-8): Wspólny szkielet Horde do wszystkich modułów Horde
Summary(pt_BR.UTF-8): Componentes comuns do Horde usados por todos os módulos
Name: %{hordeapp}
-Version: 3.3.11
-Release: 4
+Version: 4.0.0
+Release: 0.4
License: LGPL
Group: Applications/WWW
-Source0: http://ftp.horde.org/pub/horde/%{hordeapp}-%{version}.tar.gz
-# Source0-md5: ee6aee3ab7891913f6faf615f37748e3
+Source0: http://pear.horde.org/get/horde-%{version}.tgz
+# Source0-md5: 4b14b4a275ae0c5b5e61fd1680808d26
Source1: %{name}.conf
Source2: %{name}-lighttpd.conf
Source3: README.PLD
-Patch0: %{name}-path.patch
+#Patch0: %{name}-path.patch
Patch1: %{name}-shell.disabled.patch
Patch3: %{name}-blank-admins.patch
Patch4: %{name}-config-xml.patch
Patch5: %{name}-mime_drivers.patch
-Patch6: %{name}-webroot.patch
+#Patch6: %{name}-webroot.patch
Patch7: %{name}-geoip.patch
-Patch8: %{name}-crypt-detect.patch
+#Patch8: %{name}-crypt-detect.patch
URL: http://www.horde.org/
+BuildRequires: php-channel(pear.horde.org)
+BuildRequires: php-pear-PEAR >= 1:1.7.0
BuildRequires: rpm-php-pearprov >= 4.0.2-98
BuildRequires: rpmbuild(macros) >= 1.595
+Requires: php-channel(pear.horde.org)
Requires: php-common >= 4:%{php_min_version}
Requires: php-domxml
+Requires: php-filter
Requires: php-gd
Requires: php-gettext
+Requires: php-hash
+Requires: php-horde-Horde_Alarm < 2.0.0
+Requires: php-horde-Horde_Argv < 2.0.0
+Requires: php-horde-Horde_Auth < 2.0.0
+Requires: php-horde-Horde_Autoloader < 2.0.0
+Requires: php-horde-Horde_Browser < 2.0.0
+Requires: php-horde-Horde_Core < 2.0.0
+Requires: php-horde-Horde_Date < 2.0.0
+Requires: php-horde-Horde_Exception < 2.0.0
+Requires: php-horde-Horde_Form < 2.0.0
+Requires: php-horde-Horde_Group < 2.0.0
+Requires: php-horde-Horde_Http < 2.0.0
+Requires: php-horde-Horde_Image < 2.0.0
+Requires: php-horde-Horde_LoginTasks < 2.0.0
+Requires: php-horde-Horde_Mime < 2.0.0
+Requires: php-horde-Horde_Nls < 2.0.0
+Requires: php-horde-Horde_Perms < 2.0.0
+Requires: php-horde-Horde_Prefs < 2.0.0
+Requires: php-horde-Horde_Rpc < 2.0.0
+Requires: php-horde-Horde_Serialize < 2.0.0
+Requires: php-horde-Horde_Support < 2.0.0
+Requires: php-horde-Horde_Template < 2.0.0
+Requires: php-horde-Horde_Text_Diff < 2.0.0
+Requires: php-horde-Horde_Text_Filter < 2.0.0
+Requires: php-horde-Horde_Token < 2.0.0
+Requires: php-horde-Horde_Tree < 2.0.0
+Requires: php-horde-Horde_Url < 2.0.0
+Requires: php-horde-Horde_Util < 2.0.0
+Requires: php-horde-Horde_Vfs < 2.0.0
+Requires: php-horde-Horde_View < 2.0.0
Requires: php-imap
Requires: php-json
Requires: php-mbstring
@@ -46,6 +81,7 @@
Requires: php-pear-Log
Requires: php-pear-Mail
Requires: php-pear-Mail_Mime
+Requires: php-pear-Net_DNS2
Requires: php-posix
Requires: php-session
Requires: php-xml
@@ -55,12 +91,22 @@
# Suggests: smtpserver(for /usr/lib/sendmail) || smtp server
Suggests: dpkg
Suggests: enscript
+Suggests: php-horde-Horde_ActiveSync
+Suggests: php-horde-Horde_DataTree
+Suggests: php-horde-Horde_Db
+Suggests: php-horde-Horde_Feed
+Suggests: php-horde-Horde_Oauth
+Suggests: php-horde-Horde_Service_Facebook
+Suggests: php-horde-Horde_Service_Twitter
+Suggests: php-horde-Horde_SyncMl
+Suggests: php-iconv
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
Suggests: php-pear-Net_GeoIP
+Suggests: php-pear-SOAP
Suggests: php-pear-Services_Weather
Suggests: php-pecl-fileinfo
Suggests: php-pecl-geoip
@@ -81,7 +127,7 @@
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreq pear(Horde.*) pear(Net/DNS.*) pear(XML/WBXML.*) pear(SyncML.*) pear(Text/.*) pear(Net/IMSP.*) pear(XML/sql2xml.php)
+%define _noautoreq pear(SOAP.*) pear(Services/Weather.*)
%define hordedir /usr/share/horde
%define _appdir %{hordedir}
@@ -134,17 +180,23 @@
Ten pakiet zawiera horde.schema dla pakietu openldap.
%prep
-%setup -q
-%patch0 -p1
+%pear_package_setup -d horde_dir=%{_appdir}
+
+mv ./%{php_pear_dir}/data/horde/* .
+mv docs/horde/* docs
+
+cp -p %{SOURCE3} .
+
+cd ./%{_appdir}
+
+#%patch0 -p1
%patch1 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p1
-%patch6 -p1
+#%patch6 -p1
%patch7 -p1
-%patch8 -p1
-
-cp -p %{SOURCE3} .
+#%patch8 -p1 # likely in Horde_Auth package now
rm -f {,*/}.htaccess
for i in config/*.dist; do
@@ -157,23 +209,17 @@
# remove backup files from patching
find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
-# enable if you want to update patch0
-%if 0
-sed -i -e "
-s#dirname(__FILE__) . '/..#'%{hordedir}#g
-" config/registry.php.dist
-exit 1
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}/docs,/var/{lib,log}/horde,%{schemadir}}
+cd ./%{_appdir}
cp -a *.php $RPM_BUILD_ROOT%{_appdir}
cp -a config/* $RPM_BUILD_ROOT%{_sysconfdir}
touch $RPM_BUILD_ROOT%{_sysconfdir}/conf.php.bak
cp -a admin js lib locale rpc services templates themes $RPM_BUILD_ROOT%{_appdir}
-cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
+#cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
+cd -
ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -183,10 +229,6 @@
> $RPM_BUILD_ROOT/var/log/horde/%{hordeapp}.log
cp -p scripts/ldap/horde.schema $RPM_BUILD_ROOT%{schemadir}
-# don't package tests
-rm $RPM_BUILD_ROOT%{_appdir}/lib/Horde/Kolab/Test.php
-rm -r $RPM_BUILD_ROOT%{_appdir}/lib/Horde/Kolab/Test
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -195,10 +237,6 @@
install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak
fi
-%banner -o %{name} -e <<'EOF'
-Please read README.PLD from documentation.
-EOF
-
%post -n openldap-schema-horde
%openldap_schema_register %{schemadir}/horde.schema -d core
%service -q ldap restart
@@ -229,9 +267,9 @@
%files
%defattr(644,root,root,755)
-%doc README README.PLD scripts util
-%doc docs/{CHANGES,CODING_STANDARDS,CONTRIBUTING,CREDITS,HACKING,INSTALL}
-%doc docs/{PERFORMANCE,RELEASE_NOTES,SECURITY,TODO,TRANSLATIONS,UPGRADING}
+%doc README README.PLD scripts
+%doc docs/{CHANGES,CODING_STANDARDS,CONTRIBUTING,CREDITS,INSTALL}
+%doc docs/{PERFORMANCE,RELEASE,RELEASE_NOTES,SECURITY,TRANSLATIONS,UPGRADING}
%dir %attr(750,root,http) %{_sysconfdir}
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
@@ -270,6 +308,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.192 2011/04/10 21:39:10 glen
+- up to 4.0.0, uses pear channel to do the releases now
+
Revision 1.191 2011/04/08 21:35:17 glen
- drop old pre 3.0 triggers, php min version is 5.2.0, update deps
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/README.PLD?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde-lighttpd.conf?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde-mime_drivers.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde-path.patch?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde-shell.disabled.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/horde/horde.spec?r1=1.191&r2=1.192&f=u
More information about the pld-cvs-commit
mailing list