[php-pear-Net-UserAgent-Detect/el5/master] clean spec and update to 2.5.2
Remi Collet
remi at fedoraproject.org
Fri Aug 20 16:57:34 UTC 2010
commit e53b53422ccdf449ef73628cac22bf1fd4cc58b0
Author: remi <fedora at famillecollet.com>
Date: Fri Aug 20 18:26:55 2010 +0200
clean spec and update to 2.5.2
.gitignore | 3 +-
PHP-LICENSE-3.01 | 68 ------------------------------------
php-pear-Net-UserAgent-Detect.spec | 35 +++++++++++++------
sources | 2 +-
4 files changed, 27 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e678d53..5e94ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-Net_UserAgent_Detect-2.5.1.tgz
+package.xml
+/Net_UserAgent_Detect-2.5.2.tgz
diff --git a/php-pear-Net-UserAgent-Detect.spec b/php-pear-Net-UserAgent-Detect.spec
index 8dc1c12..c23ec0c 100644
--- a/php-pear-Net-UserAgent-Detect.spec
+++ b/php-pear-Net-UserAgent-Detect.spec
@@ -1,8 +1,8 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
-%define pear_name Net_UserAgent_Detect
+%global pear_name Net_UserAgent_Detect
Name: php-pear-Net-UserAgent-Detect
-Version: 2.5.1
+Version: 2.5.2
Release: 1%{?dist}
Summary: Extract information from an HTTP user agent
@@ -10,7 +10,6 @@ Group: Development/Languages
License: PHP
URL: http://pear.php.net/package/Net_UserAgent_Detect
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
-Source1: PHP-LICENSE-3.01
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -28,10 +27,13 @@ the object.
%prep
%setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
-install -pm 644 -c %{SOURCE1} LICENSE
+# Create a "localized" php.ini to avoid build warning
+cp /etc/php.ini .
+echo "date.timezone=UTC" >>php.ini
+
cd %{pear_name}-%{version}
+# Package.xml is V2
+mv ../package.xml %{name}.xml
%build
@@ -42,14 +44,18 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
# Install XML package description
install -d $RPM_BUILD_ROOT%{pear_xmldir}
-install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+install -pm 644 %{name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+
+# Fix path in example
+sed -i -e '/require_once/s!../Detect.php!Net/UserAgent/Detect.php!' \
+ $RPM_BUILD_ROOT%{pear_testdir}/%{pear_name}/tests/example.php
%clean
@@ -58,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
%post
%{__pear} install --nodeps --soft --force --register-only \
- %{pear_xmldir}/%{pear_name}.xml >/dev/null || :
+ %{pear_xmldir}/%{name}.xml >/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
@@ -69,13 +75,20 @@ fi
%files
%defattr(-,root,root,-)
-%doc LICENSE
-%{pear_xmldir}/%{pear_name}.xml
+%{pear_xmldir}/%{name}.xml
%{pear_testdir}/%{pear_name}
%{pear_phpdir}/Net
%changelog
+* Fri Aug 20 2010 Remi Collet <Fedora at FamilleCollet.com> - 2.5.2-1
+- update to 2.5.2
+- clean define
+- rename Net_UserAgent_Detect.xml to php-pear-Net-UserAgent-Detect.xml
+- set date.timezone during build
+- remove LICENSE file not provided by upstream
+- fix example
+
* Tue Sep 08 2009 Christopher Stone <chris.stone at gmail.com> 2.5.1-1
- Upstream sync
diff --git a/sources b/sources
index c0554b6..8acca55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-960ea2b396cdc921e24df9ae481a6876 Net_UserAgent_Detect-2.5.1.tgz
+646e074fd7faa8c14fba12b698ba28c9 Net_UserAgent_Detect-2.5.2.tgz
More information about the scm-commits
mailing list