[php-symfony2-Filesystem] Fedora PEAR packaging update
Shawn Iwinski
siwinski at fedoraproject.org
Mon Oct 29 12:02:18 UTC 2012
commit e8fb6bab2817a1d9f8ce10b0227bfa2d6b554528
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Mon Oct 29 08:00:52 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 "php-symfony2-Filesystem.tests.bootstrap.patch" to
"%{name}-tests-bootstrap.patch"
...> php-symfony2-Filesystem-tests.bootstrap.patch | 0
php-symfony2-Filesystem.spec | 19 +++++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/php-symfony2-Filesystem.tests.bootstrap.patch b/php-symfony2-Filesystem-tests.bootstrap.patch
similarity index 100%
rename from php-symfony2-Filesystem.tests.bootstrap.patch
rename to php-symfony2-Filesystem-tests.bootstrap.patch
diff --git a/php-symfony2-Filesystem.spec b/php-symfony2-Filesystem.spec
index 7858441..8538246 100644
--- a/php-symfony2-Filesystem.spec
+++ b/php-symfony2-Filesystem.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-Filesystem
Version: 2.1.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Symfony2 %{pear_name} Component
Group: Development/Libraries
License: MIT
URL: http://symfony.com/doc/current/components/filesystem.html
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
-Patch0: php-symfony2-Filesystem.tests.bootstrap.patch
+Patch0: %{name}-tests-bootstrap.patch
BuildArch: noarch
@@ -75,14 +76,14 @@ mv package.xml %{pear_name}-%{version}/%{name}.xml
cd %{pear_name}-%{version}
# PEAR install
-%{__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
@@ -112,6 +113,12 @@ fi
%changelog
+* Mon Oct 29 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.2-3
+- Added "%%global pear_metadir" and usage in %%install
+- Changed RPM_BUILD_ROOT to %%{buildroot}
+- Changed name of patch from "php-symfony2-Filesystem.tests.bootstrap.patch" to
+ "%%{name}-tests-bootstrap.patch"
+
* Sun Oct 7 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.1.2-2
- Added php-posix require
- Added PEAR package.xml modifications
More information about the scm-commits
mailing list