commit 73dec773ad29e701bee05ce8c7df0c30baddc9be
Merge: 9b9bde1 aa1e3fd
Author: Elan Ruusamäe <[email protected]>
Date: Thu Jul 17 22:05:39 2014 +0300
Merge branch 'HORDE_3_3'
Conflicts:
horde.spec
horde-path.patch | 11 ++++++
horde-ssh2-vfs-realpath.patch | 17 ++++++++++
horde.conf | 42 +++++++++++------------
horde.spec | 79 ++++++++++++++++++++-----------------------
4 files changed, 86 insertions(+), 63 deletions(-)
---
diff --cc horde.spec
index f9c20db,d86306d..617af80
--- a/horde.spec
+++ b/horde.spec
@@@ -28,21 -27,17 +28,20 @@@ Patch1: %{name}-shell.disabled.patc
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
+ Patch9: %{name}-ssh2-vfs-realpath.patch
URL: http://www.horde.org/
+BuildRequires: php-channel(pear.horde.org)
+BuildRequires: php-horde-Horde_Role
+BuildRequires: php-pear-PEAR >= 1:1.7.0
BuildRequires: rpm-php-pearprov >= 4.0.2-98
- BuildRequires: rpmbuild(macros) >= 1.595
+ BuildRequires: rpmbuild(macros) >= 1.654
Requires: php(core) >= %{php_min_version}
Requires: php(domxml)
- Requires: php(filter)
Requires: php(gd)
Requires: php(gettext)
- Requires: php(hash)
Requires: php(imap)
Requires: php(json)
Requires: php(mbstring)
@@@ -179,24 -133,32 +147,40 @@@ This package contains horde.schema for
%description -n openldap-schema-horde -l pl.UTF-8
Ten pakiet zawiera horde.schema dla pakietu openldap.
+ %package devel
+ Summary: Horde developmnent tools
+ Summary(pl.UTF-8): Narzędzia deweloperskie horde
+ Group: Development
+ Requires: %{name} = %{version}-%{release}
+ Requires: php-pear-File_Find
+
+ %description devel
+ Horde developmnent tools.
+
+ %description devel -l pl.UTF-8
+ Narzędzia deweloperskie horde.
+
%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 # likely in Horde_Auth package now
+ %patch8 -p1
+ %patch9 -p1
+
+ cp -p %{SOURCE3} .
rm -f {,*/}.htaccess
for i in config/*.dist; do
@@@ -209,11 -171,19 +193,12 @@@ rm test.ph
# 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}}
+ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_appdir}/docs} \
+ $RPM_BUILD_ROOT{/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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/horde.git/commitdiff/5e6316a033a18497edf16e25b5e8c3776b9ee21e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
