[php-pear-PEAR-Command-Packaging] update to 0.3.0
Remi Collet
remi at fedoraproject.org
Mon Apr 16 15:51:17 UTC 2012
commit fd61ebe830a6b2e4f8e35bc0d41983e8d2eeb96f
Author: remi <fedora at famillecollet.com>
Date: Mon Apr 16 17:49:58 2012 +0200
update to 0.3.0
.gitignore | 3 ++
...ommand-Packaging-0.3.0-fedora-conventions.patch | 34 +++++++++---------
php-pear-PEAR-Command-Packaging.spec | 35 +++++++++++--------
sources | 2 +-
4 files changed, 41 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b4050f..b7f9290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+*spec~
+package-*.xml
PEAR_Command_Packaging-0.2.0.tgz
+/PEAR_Command_Packaging-0.3.0.tgz
diff --git a/php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch b/php-pear-PEAR-Command-Packaging-0.3.0-fedora-conventions.patch
similarity index 80%
rename from php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch
rename to php-pear-PEAR-Command-Packaging-0.3.0-fedora-conventions.patch
index 92baba6..ab60470 100644
--- a/php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch
+++ b/php-pear-PEAR-Command-Packaging-0.3.0-fedora-conventions.patch
@@ -1,18 +1,6 @@
-diff -up package.xml.orig package.xml
---- package.xml.orig 1970-01-01 10:13:24.000000000 +0100
-+++ package.xml 2010-02-20 08:48:51.000000000 +0100
-@@ -66,7 +66,7 @@
- <contents>
- <dir baseinstalldir="PEAR/Command" name="/">
- <file baseinstalldir="PEAR/Command" md5sum="72a74194c78677dba2584098c3b53a2e" name="Packaging.xml" role="php" />
-- <file baseinstalldir="PEAR/Command" md5sum="70509a4f539f3f8b219fccf38831a38b" name="Packaging.php" role="php">
-+ <file baseinstalldir="PEAR/Command" name="Packaging.php" role="php">
- <tasks:replace from="@DATA-DIR@" to="data_dir" type="pear-config" />
- <tasks:replace from="@package_version@" to="version" type="package-info" />
- </file>
-diff -up PEAR_Command_Packaging-0.2.0/Packaging.php.orig PEAR_Command_Packaging-0.2.0/Packaging.php
---- PEAR_Command_Packaging-0.2.0/Packaging.php.fedora 1970-01-01 10:13:24.000000000 +0100
-+++ PEAR_Command_Packaging-0.2.0/Packaging.php 2012-01-25 17:18:40.000000000 +0100
+diff -up PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php.fedora PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php
+--- PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php.fedora 2012-04-07 22:47:13.000000000 +0200
++++ PEAR_Command_Packaging-0.3.0/PEAR/Command/Packaging.php 2012-04-16 17:41:19.000000000 +0200
@@ -72,15 +72,14 @@ are as follows:
%n = Channel name (full) e.g. pear.example.com
%N = Non standard channel name followed by a "/" (e.g. "pear.example.com/")
@@ -104,7 +92,7 @@ diff -up PEAR_Command_Packaging-0.2.0/Packaging.php.orig PEAR_Command_Packaging-
// ------------------------------------------------------------------------
// --- END DISTRIBUTION CONFIG
-@@ -593,7 +592,7 @@ Wrote: /path/to/rpm-build-tree/RPMS/noar
+@@ -597,7 +596,7 @@ Wrote: /path/to/rpm-build-tree/RPMS/noar
if ($pf->getDeps()) {
$this->_generatePackageDeps($pf);
}
@@ -113,7 +101,7 @@ diff -up PEAR_Command_Packaging-0.2.0/Packaging.php.orig PEAR_Command_Packaging-
// Hook to support virtual Provides, where the dependency name differs
// from the package name
$rpmdep = $this->_getRPMName($pf->getPackage(), $pf->getChannel(), null, 'pkgdep');
-@@ -657,9 +656,9 @@ Wrote: /path/to/rpm-build-tree/RPMS/noar
+@@ -661,9 +660,9 @@ Wrote: /path/to/rpm-build-tree/RPMS/noar
// Handle doc files
if (isset($file_list['doc'])) {
@@ -125,3 +113,15 @@ diff -up PEAR_Command_Packaging-0.2.0/Packaging.php.orig PEAR_Command_Packaging-
}
// Work out architecture
+diff -up PEAR_Command_Packaging-0.3.0/php-pear-PEAR-Command-Packaging.xml.fedora PEAR_Command_Packaging-0.3.0/php-pear-PEAR-Command-Packaging.xml
+--- PEAR_Command_Packaging-0.3.0/php-pear-PEAR-Command-Packaging.xml.fedora 2012-04-07 22:47:13.000000000 +0200
++++ PEAR_Command_Packaging-0.3.0/php-pear-PEAR-Command-Packaging.xml 2012-04-16 17:42:43.000000000 +0200
+@@ -51,7 +51,7 @@ Request #19299 Handle max + exclude vers
+ </notes>
+ <contents>
+ <dir baseinstalldir="/" name="/">
+- <file baseinstalldir="/" md5sum="c766a6a8d994f1b90f0e232144db2cfb" name="PEAR/Command/Packaging.php" role="php">
++ <file baseinstalldir="/" name="PEAR/Command/Packaging.php" role="php">
+ <tasks:replace from="@DATA-DIR@" to="data_dir" type="pear-config" />
+ <tasks:replace from="@package_version@" to="version" type="package-info" />
+ </file>
diff --git a/php-pear-PEAR-Command-Packaging.spec b/php-pear-PEAR-Command-Packaging.spec
index e5a2522..89a2e7b 100644
--- a/php-pear-PEAR-Command-Packaging.spec
+++ b/php-pear-PEAR-Command-Packaging.spec
@@ -2,8 +2,8 @@
%global pear_name PEAR_Command_Packaging
Name: php-pear-PEAR-Command-Packaging
-Version: 0.2.0
-Release: 8%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
Summary: Create RPM spec files from PEAR modules
Group: Development/System
@@ -11,11 +11,12 @@ License: PHP
URL: http://pear.php.net/package/PEAR_Command_Packaging
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
Source1: php-pear-PEAR-Command-Packaging-fedora-template-specfile
-Patch0: php-pear-PEAR-Command-Packaging-0.2.0-fedora-conventions.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: php-pear-PEAR-Command-Packaging-0.3.0-fedora-conventions.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
+
Requires: php-pear(PEAR) >= 1.4.3
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -34,11 +35,11 @@ http://fedoraproject.org/wiki/Packaging:PHP
%prep
%setup -q -c
-# Patches for Fedora conventions
-%patch0 -p0 -b .fedora
-
-mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
+mv ../package.xml %{name}.xml
+
+# Patches for Fedora conventions
+%patch0 -p1 -b .fedora
%build
@@ -46,21 +47,21 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+rm -rf %{buildroot}
+%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{pear_phpdir}/data/%{pear_name}/template.spec
+cp -p %{SOURCE1} %{buildroot}%{pear_phpdir}/data/%{pear_name}/template.spec
# 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
@@ -78,10 +79,14 @@ fi
%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_datadir}/%{pear_name}
+%{pear_testdir}/%{pear_name}
%{pear_phpdir}/PEAR/Command/Packaging.*
%changelog
+* Mon Apr 16 2012 Remi Collet <remi at fedoraproject.org> - 0.3.0-1
+- Update to 0.3.0
+
* Wed Jan 25 2012 Remi Collet <remi at fedoraproject.org> - 0.2.0-8
- clean fedora template
- fix Provides for non standard channel (missing channel name)
diff --git a/sources b/sources
index 23897e0..ea397f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-457881b46b8c42ba58cdb698872df2e6 PEAR_Command_Packaging-0.2.0.tgz
+98bb036ed762c1b99d3db0e6f8a89306 PEAR_Command_Packaging-0.3.0.tgz
More information about the scm-commits
mailing list