summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2012-11-01 12:33:27 +0100
committerRemi Collet <fedora@famillecollet.com>2012-11-01 12:33:27 +0100
commitc3871e45a4e1309d1c56563f2c30a08f845e8b31 (patch)
tree51b97ce5a6af52c7c1131218aeba783b73e4e66d
parent041548341223f951d858379b4a5428f798ec4dd1 (diff)
Update php-horde-Horde-* to 2.0.0
-rw-r--r--php-horde-Horde-Stream-Wrapper.spec36
1 files changed, 20 insertions, 16 deletions
diff --git a/php-horde-Horde-Stream-Wrapper.spec b/php-horde-Horde-Stream-Wrapper.spec
index 746374e..cafb419 100644
--- a/php-horde-Horde-Stream-Wrapper.spec
+++ b/php-horde-Horde-Stream-Wrapper.spec
@@ -1,10 +1,11 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name Horde_Stream_Wrapper
+%global pear_name Horde_Stream_Wrapper
%global pear_channel pear.horde.org
Name: php-horde-Horde-Stream-Wrapper
-Version: 1.0.1
-Release: 3%{?dist}.1
+Version: 2.0.0
+Release: 1%{?dist}
Summary: Horde Stream wrappers
Group: Development/Libraries
@@ -14,27 +15,27 @@ Source0: http://pear.horde.org/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-
-Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
-
-BuildRequires: php-pear >= 1.7.0
+BuildRequires: php-pear
BuildRequires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
+Requires: php(language) >= 5.3.0
Requires: php-channel(%{pear_channel})
-Requires: php-common >= 5.2.0
-Requires: php-pear >= 1.7.0
+
+Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
+
%description
This package provides various stream wrappers.
%prep
-%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+%setup -q -c -T
+tar xif %{SOURCE0}
cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
+
%build
cd %{pear_name}-%{version}
@@ -42,14 +43,14 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_metadir}/.??*
# Install XML package description
-mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%post
%{__pear} install --nodeps --soft --force --register-only \
@@ -68,6 +69,9 @@ fi
%doc %{pear_docdir}/%{pear_name}
%changelog
+* Thu Nov 1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
+- Update to 2.0.0 for remi repo
+
* Tue Aug 21 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.0.1-3.1
- rebuild