[php-pear-Auth-RADIUS/el6/master] update to 1.0.7 - QA release
Remi Collet
remi at fedoraproject.org
Tue Oct 26 18:42:31 UTC 2010
commit ea367e71e6bb033a160a1a9523358e15ef5ecb64
Author: remi <fedora at famillecollet.com>
Date: Tue Oct 26 20:42:25 2010 +0200
update to 1.0.7 - QA release
.gitignore | 2 ++
php-pear-Auth-RADIUS.spec | 32 ++++++++++++++++++++++----------
sources | 2 +-
3 files changed, 25 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e3aab45..1f99592 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
Auth_RADIUS-1.0.6.tgz
+package.xml
+/Auth_RADIUS-1.0.7.tgz
diff --git a/php-pear-Auth-RADIUS.spec b/php-pear-Auth-RADIUS.spec
index c7a574b..1dbc0f8 100644
--- a/php-pear-Auth-RADIUS.spec
+++ b/php-pear-Auth-RADIUS.spec
@@ -2,20 +2,21 @@
%global pear_name Auth_RADIUS
Name: php-pear-Auth-RADIUS
-Version: 1.0.6
-Release: 5%{?dist}
+Version: 1.0.7
+Release: 1%{?dist}
Summary: Wrapper Classes for the RADIUS PECL
Group: Development/Libraries
License: BSD
URL: http://pear.php.net/package/Auth_RADIUS
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source2: xml2changelog
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-pear >= 1:1.4.9-1.2
+
Requires: php-pear(PEAR)
-Requires(hint): php-pear(Crypt_CHAP) php-mcrypt
Requires: php-pecl(radius) >= 1.2.5
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -30,9 +31,15 @@ If you are using MS-CHAP you need also the mcrypt extension.
%prep
%setup -qc
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{name}.xml
+%{_bindir}/php -n %{SOURCE2} package.xml | tee CHANGELOG | head -n 10
+
+# 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
@@ -43,11 +50,11 @@ cd %{pear_name}-%{version}
%install
cd %{pear_name}-%{version}
rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-# Move documentation
mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
+# Move documentation
+mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
# Clean up unnecessary files
rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -74,13 +81,18 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc CHANGELOG docdir/*
%{pear_xmldir}/%{name}.xml
%dir %{pear_phpdir}/Auth
%{pear_phpdir}/Auth/*
%changelog
+* Tue Oct 26 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.0.7-1
+- Version 1.0.7 (stable) - API 1.0.6 (stable) - QA release
+- add generated Changelog
+- define timezone during build
+
* Wed Aug 11 2009 Remi Collet <Fedora at FamilleCollet.com> - 1.0.6-5
- clean define
- fix description
diff --git a/sources b/sources
index 3b6724e..15f629e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-01624816b44e8eaebc71e9a582d16838 Auth_RADIUS-1.0.6.tgz
+af7d3a84ce52ffad3d86a65a3f5f8bf5 Auth_RADIUS-1.0.7.tgz
More information about the scm-commits
mailing list