summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Date.spec39
1 files changed, 24 insertions, 15 deletions
diff --git a/php-horde-Horde-Date.spec b/php-horde-Horde-Date.spec
index 29e308c..ed6b53b 100644
--- a/php-horde-Horde-Date.spec
+++ b/php-horde-Horde-Date.spec
@@ -1,10 +1,11 @@
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%global pear_name Horde_Date
+%global pear_name Horde_Date
%global pear_channel pear.horde.org
Name: php-horde-Horde-Date
-Version: 1.0.11
-Release: 3%{?dist}
+Version: 2.0.0
+Release: 1%{?dist}
Summary: Horde Date package
Group: Development/Libraries
@@ -17,17 +18,21 @@ Source1: find-lang.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-BuildRequires: php-pear >= 1:1.4.9-1.2
+BuildRequires: php-pear
BuildRequires: php-channel(%{pear_channel})
BuildRequires: gettext
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-pear(%{pear_channel}/Horde_Nls) < 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Translation) < 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Exception) < 2.0.0
-Requires: php-pear(%{pear_channel}/Horde_Util) < 2.0.0
-Requires: php-common >= 5.2.0
+Requires: php(language) >= 5.3.0
+Requires: php-pear(%{pear_channel}/Horde_Nls) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_Nls) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Translation) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_Translation) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -35,7 +40,8 @@ Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
Package for creating and manipulating dates.
%prep
-%setup -q -c
+%setup -q -c -T
+tar xif %{SOURCE0}
cd %{pear_name}-%{version}
@@ -58,19 +64,19 @@ done
%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}
%if 0%{?fedora} > 13
%find_lang %{pear_name}
%else
-sh %{SOURCE1} $RPM_BUILD_ROOT %{pear_name}
+sh %{SOURCE1} %{buildroot} %{pear_name}
%endif
@@ -99,6 +105,9 @@ fi
%changelog
+* Thu Nov 1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
+- Update to 2.0.0 for remi repo
+
* Sun Aug 19 2012 Remi Collet <remi@fedoraproject.org> - 1.0.11-3
- rebuilt for new pear_datadir