[php-symfony2-Console] Fedora PEAR packaging update
Shawn Iwinski
siwinski at fedoraproject.org
Sun Oct 28 00:57:07 UTC 2012
commit 35ac0b7493a48339eb4a4f042c74e61326d29f8a
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sat Oct 27 20:56:16 2012 -0400
Fedora PEAR packaging update
See http://lists.fedoraproject.org/pipermail/php-devel/2012-October/000192.html
- Added "%global pear_metadir" and usage in %%install
- Changed RPM_BUILD_ROOT to %{buildroot}
- Changed name of patch from "tests-bootstrap.patch" to
"%{name}-tests-bootstrap.patch"
...h => php-symfony2-Console-tests-bootstrap.patch | 0
php-symfony2-Console.spec | 20 ++++++++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/tests-bootstrap.patch b/php-symfony2-Console-tests-bootstrap.patch
similarity index 100%
rename from tests-bootstrap.patch
rename to php-symfony2-Console-tests-bootstrap.patch
diff --git a/php-symfony2-Console.spec b/php-symfony2-Console.spec
index bdf6516..1207cde 100644
--- a/php-symfony2-Console.spec
+++ b/php-symfony2-Console.spec
@@ -1,4 +1,5 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%global pear_channel pear.symfony.com
%global pear_name %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g')
@@ -6,14 +7,14 @@
Name: php-symfony2-Console
Version: 2.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Symfony2 %{pear_name} Component
Group: Development/Libraries
License: MIT
URL: http://symfony.com/doc/current/components/console.html
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-Patch0: tests-bootstrap.patch
+Patch0: %{name}-tests-bootstrap.patch
BuildArch: noarch
@@ -69,6 +70,7 @@ cd ..
# Modify PEAR package.xml file:
# - Change role from "php" to "doc" for CHANGELOG.md file
# - Change role from "php" to "test" for all test files
+# - Remove md5sum from bootsrap.php file since it was patched
sed -e '/CHANGELOG.md/s/role="php"/role="doc"/' \
-e '/phpunit.xml.dist/s/role="php"/role="test"/' \
-e '/Tests/s/role="php"/role="test"/' \
@@ -85,14 +87,14 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml
%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}
%check
@@ -122,6 +124,12 @@ fi
%changelog
+* Sat Oct 27 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.2-2
+- Added "%%global pear_metadir" and usage in %%install
+- Changed RPM_BUILD_ROOT to %%{buildroot}
+- Changed name of patch from "tests-bootstrap.patch" to
+ "%%{name}-tests-bootstrap.patch"
+
* Fri Oct 19 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.2-1
- Updated to upstream version 2.1.2
- PHP minimum version 5.3.3 instead of 5.3.2
More information about the scm-commits
mailing list