diff options
| author | Remi Collet <fedora@famillecollet.com> | 2012-08-01 10:26:08 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2012-08-01 10:26:08 +0200 |
| commit | 80ff24609897002d649ec3a8b5a5a5238b63d88c (patch) | |
| tree | ff5ed055b4ec4683b9aa82c1fac6ae88cd18884d | |
| parent | 2ba64b4f7ed5340700cedc81ca0eddb07bbf46a8 (diff) | |
php-horde-Horde-Stream-Wrapper: backport
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | php-horde-Horde-Stream-Wrapper.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-Stream-Wrapper.spec b/php-horde-Horde-Stream-Wrapper.spec index 598084d..698c3f1 100644 --- a/php-horde-Horde-Stream-Wrapper.spec +++ b/php-horde-Horde-Stream-Wrapper.spec @@ -16,6 +16,7 @@ BuildArch: noarch Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php-pear >= 1.7.0 BuildRequires: php-channel(%{pear_channel}) @@ -33,10 +34,6 @@ This package provides various stream wrappers. [ -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} %build @@ -45,7 +42,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}/.??* @@ -65,11 +62,15 @@ if [ $1 -eq 0 ] ; then fi %files +%defattr(-,root,root,-) %{pear_xmldir}/%{name}.xml %{pear_phpdir}/Horde %doc %{pear_docdir}/%{pear_name} %changelog +* Wed Aug 01 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.0.1-3 +- backport for remi repo + * Thu Jul 12 2012 Nick Bebout <nb@fedoraproject.org> - 1.0.1-3 - Fix packaging issues |