[php-phpunit-bytekit] Upstream for 1.1.2
Guillaume Kulakowski
llaumgui at fedoraproject.org
Sat Nov 5 11:10:44 UTC 2011
commit fd1c5f108c058fdef47fc3a1627c4fe48985971d
Author: Guillaume Kulakowski <guillaume at llaumgui.com>
Date: Sat Nov 5 12:10:40 2011 +0100
Upstream for 1.1.2
.gitignore | 1 +
php-phpunit-bytekit.spec | 36 +++++++++++++++++++-----------------
sources | 2 +-
3 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9fbef10..671e975 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
bytekit-1.1.1.tgz
+/bytekit-1.1.2.tgz
diff --git a/php-phpunit-bytekit.spec b/php-phpunit-bytekit.spec
index c85e55b..31fa008 100644
--- a/php-phpunit-bytekit.spec
+++ b/php-phpunit-bytekit.spec
@@ -1,10 +1,10 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name bytekit
-%define channel pear.phpunit.de
+%global pear_name bytekit
+%global channel pear.phpunit.de
Name: php-phpunit-bytekit
-Version: 1.1.1
-Release: 2%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
Summary: A command-line tool built on the PHP Bytekit extension
Group: Development/Libraries
@@ -14,12 +14,12 @@ Source0: http://pear.phpunit.de/get/%{pear_name}-%{version}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php-pear >= 1:1.4.9-1.2
+BuildRequires: php-pear >= 1:1.9.0
BuildRequires: php-channel(%{channel})
Requires: php-channel(%{channel})
Requires: php-pear(pear.phpunit.de/File_Iterator) >= 1.1.0
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
+Requires(post): pear
+Requires(postun): pear
Provides: php-pear(%{channel}/%{pear_name}) = %{version}
@@ -35,9 +35,8 @@ analysis tasks.
%prep
%setup -q -c
[ -f package2.xml ] || mv package.xml package2.xml
-%{__mv} package2.xml %{pear_name}-%{version}/%{name}.xml
+mv package2.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
-%{__sed} -i -e "s@<min>1.8.1</min>@<min>1.7.2</min>@" %{name}.xml
%build
@@ -47,29 +46,29 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
-%{__rm} -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+rm -rf %{buildroot} docdir
+pear install --nodeps --packagingroot %{buildroot} %{name}.xml
# Clean up unnecessary files
-%{__rm} -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_phpdir}/.??*
# 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}
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
-%{__pear} install --nodeps --soft --force --register-only \
+pear install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
- %{__pear} uninstall --nodeps --ignore-errors --register-only \
+ pear uninstall --nodeps --ignore-errors --register-only \
pear.phpunit.de/%{pear_name} >/dev/null || :
fi
@@ -82,6 +81,9 @@ fi
%changelog
+* Sat Nov 05 2011 Guillaume Kulakowski <guillaume DOT kulakowski AT fedoraproject DOT org> - 1.1.2-1
+- upstream 1.1.2
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 813f8b9..14a2f73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dec667472af72b36c7fd3dcfe7c43364 bytekit-1.1.1.tgz
+e4c7eb459a2961a71c2062c330d6f79b bytekit-1.1.2.tgz
More information about the scm-commits
mailing list