diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-08-01 10:41:57 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-08-01 10:41:57 +0200 |
| commit | 5e71a4404d363f5ed725e5c671994462394cc027 (patch) | |
| tree | 9bafd21dfd33941dc73666c6ab1f5ae531e76382 | |
| parent | 16b2b363a9f58a13baa7be46867ec5b64f147a05 (diff) | |
php-horde-Horde-Http: backport
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | php-horde-Horde-Http.spec | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + diff --git a/php-horde-Horde-Http.spec b/php-horde-Horde-Http.spec index f8adcc3..7b23ca5 100644 --- a/php-horde-Horde-Http.spec +++ b/php-horde-Horde-Http.spec @@ -11,6 +11,7 @@ License: BSD URL: http://pear.horde.org Source0: http://pear.horde.org/get/%{pear_name}-%{version}.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch BuildRequires: php-pear(PEAR) >= 1.7.0 BuildRequires: php-channel(pear.horde.org) @@ -32,10 +33,6 @@ This package provides a set of classes for making HTTP requests. [ -f package2.xml ] || mv package.xml package2.xml mv package2.xml %{pear_name}-%{version}/%{name}.xml -# Create a "localized" php.ini to avoid build warning -cp /etc/php.ini . -echo "date.timezone=UTC" >>php.ini - cd %{pear_name}-%{version} @@ -46,7 +43,7 @@ cd %{pear_name}-%{version} %install cd %{pear_name}-%{version} -PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml +%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml # Clean up unnecessary files rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* @@ -66,6 +63,7 @@ if [ $1 -eq 0 ] ; then fi %files +%defattr(-,root,root,-) %doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde/Http @@ -73,6 +71,9 @@ fi %{pear_testdir}/Horde_Http %changelog +* Wed Aug 01 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.1.1-1 +- backport for remi repo + * Thu Jun 21 2012 Nick Bebout <nb@fedoraproject.org> - 1.1.1-1 - Upgrade to 1.1.1 |