[php-twig-Twig] Updated to upstream version 1.8.2 & updates per other package review
Shawn Iwinski
siwinski at fedoraproject.org
Sun Jun 10 02:41:23 UTC 2012
commit b0b4e95af18b34a46ca24c93bf18dd262928cb14
Author: Shawn Iwinski <shawn.iwinski at gmail.com>
Date: Sat Jun 9 22:39:37 2012 -0400
Updated to upstream version 1.8.2 & 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 %clean section
.gitignore | 1 +
php-twig-Twig.spec | 22 +++++++++++-----------
sources | 2 +-
3 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a4b9a5..7c320eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Twig-1.8.1.tgz
+/Twig-1.8.2.tgz
diff --git a/php-twig-Twig.spec b/php-twig-Twig.spec
index 0de5979..592c4ca 100644
--- a/php-twig-Twig.spec
+++ b/php-twig-Twig.spec
@@ -3,8 +3,8 @@
%global pear_name %(echo %{name} | sed -e 's/^php-twig-//' -e 's/-/_/g')
Name: php-twig-Twig
-Version: 1.8.1
-Release: 2%{?dist}
+Version: 1.8.2
+Release: 1%{?dist}
Summary: Twig is a modern template engine for PHP
Group: Development/Libraries
@@ -13,7 +13,6 @@ URL: http://twig.sensiolabs.org
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})
@@ -51,9 +50,8 @@ The flexible, fast, and secure template engine for PHP.
%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
@@ -62,7 +60,6 @@ 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
@@ -73,10 +70,6 @@ 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 || :
@@ -96,6 +89,13 @@ fi
%changelog
+* Thu May 31 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 1.8.2-1
+- Updated to upstream version 1.8.2
+- Removed "BuildRequires: php-pear >= 1:1.4.9-1.2"
+- Updated %%prep section
+- Removed cleaning buildroot from %%install section
+- Removed %%clean section
+
* Sun May 20 2012 Shawn Iwinski <shawn.iwinski at gmail.com> 1.8.1-2
- Removed BuildRoot
- Changed php require to php-common
diff --git a/sources b/sources
index 7fbb740..1c3f8bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1e0d2a5b34655a92eac80412596e700 Twig-1.8.1.tgz
+ea693b7d2a2a0470dbb5ba1467962ddc Twig-1.8.2.tgz
More information about the scm-commits
mailing list