[php-pear-Net-IPv4] update to 1.3.4
Remi Collet
remi at fedoraproject.org
Mon Apr 2 15:35:15 UTC 2012
commit 6d7baa5298c9f06a1f463c06697b6cedaebf8168
Author: remi <fedora at famillecollet.com>
Date: Mon Apr 2 17:34:04 2012 +0200
update to 1.3.4
.gitignore | 3 +++
php-pear-Net-IPv4.spec | 38 +++++++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 31 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 508a32b..3afef77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+*spec~
+package-*.xml
Net_IPv4-1.3.0.tgz
+/Net_IPv4-1.3.4.tgz
diff --git a/php-pear-Net-IPv4.spec b/php-pear-Net-IPv4.spec
index a40590f..6d0d6d8 100644
--- a/php-pear-Net-IPv4.spec
+++ b/php-pear-Net-IPv4.spec
@@ -2,18 +2,22 @@
%define pear_name Net_IPv4
Name: php-pear-Net-IPv4
-Version: 1.3.0
-Release: 6%{?dist}
+Version: 1.3.4
+Release: 1%{?dist}
Summary: IPv4 network calculations and validation
Group: Development/Libraries
License: PHP
URL: http://pear.php.net/package/Net_IPv4
Source: http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: php-pear >= 1:1.4.9-1.2
BuildArch: noarch
+# For tests
+BuildRequires: php-pear(pear.phpunit.de/PHPUnit)
+
+
Requires: php-pear(PEAR)
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -27,9 +31,9 @@ validity.
%prep
%setup -qc
-%{__pear} convert package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
cd %{pear_name}-%{version}
+# Package.xml is V2
+mv ../package.xml %{pear_name}.xml
%build
@@ -38,20 +42,27 @@ cd %{pear_name}-%{version}
%install
+rm -rf %{buildroot}
cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml
# Clean up unnecessary files
-rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
+rm -rf %{buildroot}%{pear_phpdir}/.??*
# Install XML package description
-install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -d %{buildroot}%{pear_xmldir}
+install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+
+
+%check
+cd %{pear_name}-%{version}
+phpunit \
+ -d include_path=.:%{buildroot}%{pear_phpdir}:%{pear_phpdir} \
+ tests
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
@@ -70,9 +81,14 @@ fi
%{pear_xmldir}/%{pear_name}.xml
%dir %{pear_phpdir}/Net
%{pear_phpdir}/Net/IPv4.php
+%{pear_testdir}/%{pear_name}
%changelog
+* Mon Apr 02 2012 Remi Collet <remi at fedoraproject.org> - 1.3.4-1
+- Version 1.3.4 (stable) - API 1.3.0 (stable)
+- run phpunit during %%check
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 504d40a..875bd0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35ee77683b4fd34d7a9aa77c199b2eda Net_IPv4-1.3.0.tgz
+0fbb25a20b51ca6a77d99819418a8a54 Net_IPv4-1.3.4.tgz
More information about the scm-commits
mailing list