[php-horde-Horde-Cache] update to 2.0.3, requires Horde_Compress_Fast instead of LZF, fix License
Remi Collet
remi at fedoraproject.org
Thu Mar 7 13:56:46 UTC 2013
commit 1cd5e4fa61e8e4918993fdf17297af7195b89f05
Author: Remi Collet <remi at fedoraproject.org>
Date: Thu Mar 7 14:56:42 2013 +0100
update to 2.0.3, requires Horde_Compress_Fast instead of LZF, fix License
.gitignore | 2 +
php-horde-Horde-Cache.spec | 65 +++++++++++++++++++++++++------------------
sources | 2 +-
3 files changed, 41 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44f79dd..62b8f2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*spec~
/Horde_Cache-2.0.1.tgz
+/Horde_Cache-2.0.3.tgz
diff --git a/php-horde-Horde-Cache.spec b/php-horde-Horde-Cache.spec
index d0ec1a2..61a1635 100644
--- a/php-horde-Horde-Cache.spec
+++ b/php-horde-Horde-Cache.spec
@@ -1,37 +1,42 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%global pear_name Horde_Cache
+%global pear_name Horde_Cache
+%global pear_channel pear.horde.org
Name: php-horde-Horde-Cache
-Version: 2.0.1
-Release: 3%{?dist}
+Version: 2.0.3
+Release: 1%{?dist}
Summary: Horde Caching API
Group: Development/Libraries
-License: LGPLv2+
-URL: http://pear.horde.org
-Source0: http://pear.horde.org/get/%{pear_name}-%{version}.tgz
+License: LGPLv2
+URL: http://%{pear_channel}
+Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
BuildArch: noarch
-
+BuildRequires: php-common >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
-BuildRequires: php-channel(pear.horde.org)
+BuildRequires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-pear(pear.horde.org/Horde_Exception) >= 2.0.0
-Requires: php-pear(pear.horde.org/Horde_Util) >= 2.0.0
-Requires: php-pecl(LZF) >= 1.5.2
-Requires: php-pear(PEAR) >= 1.7.0
Requires: php-common >= 5.3.0
-Requires: php-channel(pear.horde.org)
-Requires: php-pear(pear.horde.org/Horde_Log) >= 2.0.0
-
+Requires: php-date
+Requires: php-hash
+Requires: php-spl
+Requires: php-pear(PEAR) >= 1.7.0
+Requires: php-channel(%{pear_channel})
+Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
+# Optional dependencies
+Requires: php-pear(%{pear_channel}/Horde_Compress_Fast) >= 1.0.0
+Requires: php-pear(%{pear_channel}/Horde_Log) >= 2.0.0
# These are optional deps, commenting out until they are available
-#Requires: php-pear(pear.horde.org/Horde_Db) >= 2.0.0
-#Requires: php-pear(pear.horde.org/Horde_Memcache) >= 2.0.0
+#Requires: php-pear(%{pear_channel}/Horde_Db) >= 2.0.0
+#Requires: php-pear(%{pear_channel}/Horde_Memcache) >= 2.0.0
+
+Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
-Provides: php-pear(pear.horde.org/Horde_Cache) = %{version}
%description
This package provides a simple, functional caching API, with the option to
@@ -39,12 +44,12 @@ store the cached data on the filesystem, in one of the PHP opcode cache
systems (APC, eAcclerator, XCache, or Zend Performance Suite's content
cache), memcached, or an SQL table.
+
%prep
%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
+cp ../package.xml %{name}.xml
%build
@@ -54,14 +59,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_metadir}/.??*
+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 \
@@ -70,17 +75,23 @@ install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
%postun
if [ $1 -eq 0 ] ; then
%{__pear} uninstall --nodeps --ignore-errors --register-only \
- pear.horde.org/%{pear_name} >/dev/null || :
+ %{pear_channel}/%{pear_name} >/dev/null || :
fi
%files
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Horde/Cache
%{pear_phpdir}/Horde/Cache.php
-%{pear_datadir}/Horde_Cache
-%doc %{pear_docdir}/Horde_Cache/COPYING
+%{pear_datadir}/%{pear_name}
+
%changelog
+* Wed Mar 06 2013 Remi Collet <remi at fedoraproject.org> - 2.0.3-1
+- Update to 2.0.3
+- requires Horde_Compress_Fast instead of LZF
+- fix License
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 7d47ea2..710dda0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2941fba5a39c56482ab57bb6db00a0eb Horde_Cache-2.0.1.tgz
+fa9a329406057fd00c3bb3b2fdbe05de Horde_Cache-2.0.3.tgz
More information about the scm-commits
mailing list