[php-symfony2-Config] Updated to upstream version 2.0.15 & updates per other package review
Shawn Iwinski
siwinski at fedoraproject.org
Sun Jun 10 01:42:58 UTC 2012
commit e42c76edcefc852ce19d8e8580208bdc24cafce7
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sat Jun 9 21:42:14 2012 -0400
Updated to upstream version 2.0.15 & updates per other package review
(See: https://bugzilla.redhat.com/show_bug.cgi?id=817303)
- Removed "BuildRequires: php-pear >= 1:1.4.9-1.2"
- Updated %prep section
- Removed cleaning buildroot from %install section
- Removed documentation move from %install section (fixed upstream)
- Removed %clean section
- Updated %doc in %files section
.gitignore | 1 +
php-symfony2-Config.spec | 38 ++++++++++++++------------------------
sources | 2 +-
3 files changed, 16 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4fc29d..c17fd19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Config-2.0.14.tgz
+/Config-2.0.15.tgz
diff --git a/php-symfony2-Config.spec b/php-symfony2-Config.spec
index bd72c26..64518fe 100644
--- a/php-symfony2-Config.spec
+++ b/php-symfony2-Config.spec
@@ -3,8 +3,8 @@
%global pear_name %(echo %{name} | sed -e 's/^php-symfony2-//' -e 's/-/_/g')
Name: php-symfony2-Config
-Version: 2.0.14
-Release: 3%{?dist}
+Version: 2.0.15
+Release: 1%{?dist}
Summary: Symfony2 %{pear_name} Component
Group: Development/Libraries
@@ -13,7 +13,6 @@ URL: http://symfony.com/components
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
BuildArch: noarch
-BuildRequires: php-pear >= 1:1.4.9-1.2
BuildRequires: php-pear(PEAR)
BuildRequires: php-channel(%{pear_channel})
@@ -35,9 +34,8 @@ Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
%prep
%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
-cd %{pear_name}-%{version}
+# package.xml is version 2.0
+mv package.xml %{pear_name}-%{version}/%{name}.xml
%build
@@ -46,31 +44,16 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
-# Move documentation to correct location
-# NOTE: Remove this when upstream updates their package.xml with role="doc"
-# for these files
-mkdir -p $RPM_BUILD_ROOT%{pear_docdir}/Symfony/Component/%{pear_name}
-mv -f \
- $RPM_BUILD_ROOT%{pear_phpdir}/Symfony/Component/%{pear_name}/composer.json \
- $RPM_BUILD_ROOT%{pear_phpdir}/Symfony/Component/%{pear_name}/LICENSE \
- $RPM_BUILD_ROOT%{pear_phpdir}/Symfony/Component/%{pear_name}/README.md \
- $RPM_BUILD_ROOT%{pear_docdir}/Symfony/Component/%{pear_name}
-
# Install XML package description
mkdir -p $RPM_BUILD_ROOT%{pear_xmldir}
install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-
%post
%{__pear} install --nodeps --soft --force --register-only \
%{pear_xmldir}/%{name}.xml >/dev/null || :
@@ -84,9 +67,7 @@ fi
%files
-%doc %{pear_docdir}/Symfony/Component/%{pear_name}
-%dir %{pear_docdir}/Symfony/Component
-%dir %{pear_docdir}/Symfony
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/Symfony/Component/%{pear_name}
%dir %{pear_phpdir}/Symfony/Component
@@ -94,6 +75,15 @@ fi
%changelog
+* Wed May 30 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.0.15-1
+- Updated to upstream version 2.0.15
+- Removed "BuildRequires: php-pear >= 1:1.4.9-1.2"
+- Updated %%prep section
+- Removed cleaning buildroot from %%install section
+- Removed documentation move from %%install section (fixed upstream)
+- Removed %%clean section
+- Updated %%doc in %%files section
+
* Sun May 20 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 2.0.14-3
- Moved documentation to correct location
diff --git a/sources b/sources
index ecfd6e9..1d00a4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64141efc293b831c86b3fd1c09bb5fc1 Config-2.0.14.tgz
+65029090d9c5106db12574230f7f8c6d Config-2.0.15.tgz
More information about the scm-commits
mailing list