[php-pear-Auth] - Updated to 1.6.2 (stable), API 1.5.0 (stable) - add link to upstream bugs https://pear.php.net/b
Remi Collet
remi at fedoraproject.org
Tue Jan 29 13:08:22 UTC 2013
commit 2855ffd79e40c27351d533751e0a540e849b37ea
Author: Remi Collet <remi at fedoraproject.org>
Date: Tue Jan 29 14:08:14 2013 +0100
- Updated to 1.6.2 (stable), API 1.5.0 (stable)
- add link to upstream bugs
https://pear.php.net/bugs/19805 : missing LICENSE
https://pear.php.net/bugs/19806 : md5.js
- doc in /usr/share/doc/pear
.gitignore | 3 ++
php-pear-Auth.spec | 60 ++++++++++++++++++++++++++++++++--------------------
sources | 2 +-
3 files changed, 41 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3f5192b..dbec417 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
+*spec~
+package-*.xml
Auth-1.6.2.tgz
+/Auth-1.6.4.tgz
diff --git a/php-pear-Auth.spec b/php-pear-Auth.spec
index fbe2b01..0d397d1 100644
--- a/php-pear-Auth.spec
+++ b/php-pear-Auth.spec
@@ -1,25 +1,29 @@
%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
%define pear_name Auth
Name: php-pear-Auth
-Version: 1.6.2
-Release: 5%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
Summary: Authentication provider for PHP
Group: Development/Libraries
License: PHP
URL: http://pear.php.net/package/Auth
Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz
+# https://pear.php.net/bugs/19805
Source1: PHP-LICENSE-3.01
-#Patch0: %{name}-1.6.1-md5sum.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: php-pear >= 1:1.4.9-1.2
+BuildRequires: php-pear
-Provides: php-pear(%{pear_name}) = %{version}
Requires: php-pear(Net_POP3) >= 1.3.0
Requires: php-imap
Requires: php-ldap
+Requires: php-pcre
+Requires: php-session
Requires: php-soap
+Requires: php-xml
Requires: php-pear(DB) >= 1.6.0
Requires: php-pear(File_Passwd) >= 1.1.0
Requires: php-pear(HTTP_Client) >= 1.1.0
@@ -28,6 +32,8 @@ Requires: php-pear(Net_POP3) >= 1.3.0
Requires: php-pear(MDB2) >= 2.0
Requires: php-pear(SOAP) >= 0.9.0
+Provides: php-pear(%{pear_name}) = %{version}
+
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -53,40 +59,39 @@ Requires: %{name} = %{version}-%{release}
%description radius
This package adds a RADIUS container for the PHP Auth system.
+
%prep
%setup -q -c
-[ -f package2.xml ] || mv package.xml package2.xml
-mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml
+
+cp %{SOURCE1} LICENSE
+
cd %{pear_name}-%{version}
-# Fix end of line encodings
-# %patch0 -p0 -b .md5sum
-%{__sed} -i 's/\r//' README.Auth
+# https://pear.php.net/bugs/19806
+sed -e '/md5.js/s/role="data"/role="php"/' \
+ ../package.xml >%{pear_name}.xml
+
%build
cd %{pear_name}-%{version}
# Empty build section, most likely nothing required.
+
%install
+rm -rf %{buildroot}
cd %{pear_name}-%{version}
-rm -rf $RPM_BUILD_ROOT docdir
-%{__pear} install --offline --nodeps --installroot $RPM_BUILD_ROOT %{pear_name}.xml
-
-# Move documentation
-mkdir -p docdir
-mv $RPM_BUILD_ROOT%{pear_docdir}/* docdir
-# License file added
-install -pm 644 -c %{SOURCE1} docdir/LICENSE
+%{__pear} install --force --nodeps --installroot %{buildroot} %{pear_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 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir}
+mkdir -p %{buildroot}%{pear_xmldir}
+install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir}
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
@@ -102,7 +107,8 @@ fi
%files
%defattr(-,root,root,-)
-%doc %{pear_name}-%{version}/docdir/%{pear_name}/*
+%doc LICENSE
+%doc %{pear_docdir}/%{pear_name}
%{pear_xmldir}/%{pear_name}.xml
%{pear_phpdir}/%{pear_name}*
%{pear_testdir}/%{pear_name}
@@ -117,7 +123,15 @@ fi
%defattr(-,root,root,-)
%{pear_phpdir}/%{pear_name}/Container/RADIUS.php
+
%changelog
+* Tue Jan 29 2013 Remi Collet <remi at fedoraproject.org> - 1.6.4-1
+- Updated to 1.6.2 (stable), API 1.5.0 (stable)
+- add link to upstream bugs
+ https://pear.php.net/bugs/19805 : missing LICENSE
+ https://pear.php.net/bugs/19806 : md5.js
+- doc in /usr/share/doc/pear
+
* Tue Aug 14 2012 Remi Collet <remi at fedoraproject.org> - 1.6.2-5
- rebuilt for new pear_testdir
diff --git a/sources b/sources
index 8f2c147..d43b34e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59e13ecba066722a911c216d03d52524 Auth-1.6.2.tgz
+5b753f9f6ad799aa3ac1c691c07b2654 Auth-1.6.4.tgz
More information about the scm-commits
mailing list