Attachment 5847 Details for Bug 14993 – Patch suggestion for SPECS/zarafa.spec

[patch] Patch suggestion for SPECS/zarafa.spec

zarafa.patch (text/plain), 1.87 KB, created by Robert Scheck on 2015-01-29 23:22:14 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Scheck

Created: 2015-01-29 23:22:14 CET

Size: 1.87 KB

patch

obsolete

>--- zarafa.spec				2015-01-29 23:19:47.000000000 +0100
>+++ zarafa.spec.rsc			2015-01-29 23:19:55.000000000 +0100
>@@ -47,6 +47,7 @@
> Source4:	%{name}.rpmlintrc
> Patch0:		zarafa-7.1.11-rpath.patch
> Patch1:		zarafa-7.1.10-kyotocabinet.patch
>+Patch2:		zarafa-7.1.11-php-unbundle.patch
> BuildRequires:	byacc
> BuildRequires:	curl-devel
> BuildRequires:	flex
>@@ -310,7 +311,8 @@
> Requires:	apache-mod_php >= 5.2
> Requires:	php-mapi >= %{version}-%{release}
> BuildArch:	noarch
>-Requires:	php-pear
>+Requires:	php-json
>+Requires:	php-pear-XML_Serializer
> Requires:	php-iconv
> 
> 
>@@ -343,6 +345,7 @@
> %patch0 -p1 -b .rpath
> touch -c -r aclocal.m4.rpath aclocal.m4
> %patch1 -p1 -b .kyotocabinet
>+%patch2 -p1 -b .php-unbundle
> 
> %build
> #autoreconf -fi
>@@ -469,22 +472,9 @@
> install -m0644 installer/linux/ldap.active-directory.cfg %{buildroot}%{_sysconfdir}/%{name}/
> install -m0644 installer/linux/ldap.openldap.cfg %{buildroot}%{_sysconfdir}/%{name}/
> 
>-# don't bundle PEAR
>-
>-# php-pear
>-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/PEAR.php
>-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Util.php
>-
>-# php-pear-XML_Serializer
>-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Serializer.php
>-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Unserializer.php
>-
>-# php-pear-Services_JSON
>-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/JSON.php
>-
>-# php-pear-XML_Parser
>-rm -rf %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Parser
>-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Parser.php
>+# Remove bundled PHP PEAR files/libraries
>+rm -rf %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR
>+rm -f %{buildroot}%{_datadir}/%{name}-webaccess/{.,server/core}/*.php-unbundle
> 
> # Remove files only required by proprietary web services
> rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/ws.cfg,%{_datadir}/zarafa/timezones}

--- zarafa.spec				2015-01-29 23:19:47.000000000 +0100
+++ zarafa.spec.rsc			2015-01-29 23:19:55.000000000 +0100
@@ -47,6 +47,7 @@
 Source4:	%{name}.rpmlintrc
 Patch0:		zarafa-7.1.11-rpath.patch
 Patch1:		zarafa-7.1.10-kyotocabinet.patch
+Patch2:		zarafa-7.1.11-php-unbundle.patch
 BuildRequires:	byacc
 BuildRequires:	curl-devel
 BuildRequires:	flex
@@ -310,7 +311,8 @@
 Requires:	apache-mod_php >= 5.2
 Requires:	php-mapi >= %{version}-%{release}
 BuildArch:	noarch
-Requires:	php-pear
+Requires:	php-json
+Requires:	php-pear-XML_Serializer
 Requires:	php-iconv
 
 
@@ -343,6 +345,7 @@
 %patch0 -p1 -b .rpath
 touch -c -r aclocal.m4.rpath aclocal.m4
 %patch1 -p1 -b .kyotocabinet
+%patch2 -p1 -b .php-unbundle
 
 %build
 #autoreconf -fi
@@ -469,22 +472,9 @@
 install -m0644 installer/linux/ldap.active-directory.cfg %{buildroot}%{_sysconfdir}/%{name}/
 install -m0644 installer/linux/ldap.openldap.cfg %{buildroot}%{_sysconfdir}/%{name}/
 
-# don't bundle PEAR
-
-# php-pear
-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/PEAR.php
-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Util.php
-
-# php-pear-XML_Serializer
-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Serializer.php
-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Unserializer.php
-
-# php-pear-Services_JSON
-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/JSON.php
-
-# php-pear-XML_Parser
-rm -rf %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Parser
-rm -f %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR/XML/Parser.php
+# Remove bundled PHP PEAR files/libraries
+rm -rf %{buildroot}%{_datadir}/%{name}-webaccess/server/PEAR
+rm -f %{buildroot}%{_datadir}/%{name}-webaccess/{.,server/core}/*.php-unbundle
 
 # Remove files only required by proprietary web services
 rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/ws.cfg,%{_datadir}/zarafa/timezones}

Actions: View | Diff

Attachments on bug 14993: 5846 | 5847 | 5848