[php-pear-CAS/el6] update to 1.2.2
Remi Collet
remi at fedoraproject.org
Sat Jun 11 14:56:20 UTC 2011
commit 60ecb1e7919892d06303e11a236d734c3ba82e7e
Author: remi <fedora at famillecollet.com>
Date: Sat Jun 11 16:55:52 2011 +0200
update to 1.2.2
.gitignore | 5 ++---
php-pear-CAS.spec | 39 +++++++++++++++++++++------------------
sources | 2 +-
3 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 03f1dde..66dcccb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
+*~
package-*.xml
-CAS-1.1.1.tgz
-CAS-1.1.2.tgz
-/CAS-1.1.3.tgz
+/CAS-1.2.2.tgz
diff --git a/php-pear-CAS.spec b/php-pear-CAS.spec
index 3f5c11d..2ad92a8 100644
--- a/php-pear-CAS.spec
+++ b/php-pear-CAS.spec
@@ -5,16 +5,14 @@
Name: php-pear-CAS
-Version: 1.1.3
+Version: 1.2.2
Release: %{?prever:0.}1%{?prever:.}%{?prever}%{?dist}
Summary: Central Authentication Service client library in php
Group: Development/Libraries
License: BSD
-URL: http://www.ja-sig.org/wiki/display/CASC/phpCAS
-Source0: http://www.ja-sig.org/downloads/cas-clients/php/%{version}%{?prever}/%{pear_name}-%{version}%{?prever}.tgz
-
-Patch0: php-pear-CAS-systemlibs.patch
+URL: https://wiki.jasig.org/display/CASC/phpCAS
+Source0: http://downloads.jasig.org/cas-clients/php/%{version}%{?prever}/%{pear_name}-%{version}%{?prever}.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -22,9 +20,8 @@ BuildRequires: php-pear >= 1:1.4.9-1.2
Requires(post): %{__pear}
Requires(postun): %{__pear}
-Requires: php-pear(DB) >= 1.4.0
Requires: php-pear(PEAR) >= 1.4.3
-Requires: php-domxml-php4-php5
+Requires: php-pdo, php-xml >= 5.0.0
Provides: php-pear(%{channel}/%{pear_name}) = %{version}
# this library is mostly known as phpCAS
Provides: phpCAS = %{version}-%{release}
@@ -41,14 +38,14 @@ This package is a PEAR library for using a Central Authentication Service.
cp /etc/php.ini .
echo "date.timezone=UTC" >>php.ini
+# Create links for standard RPM docdir (to standard PEAR docdir)
+ln -s %{pear_docdir}/%{pear_name}/docs docs
+ln -s %{pear_docdir}/%{pear_name}/docs/README LICENSE
+
cd %{pear_name}-%{version}%{?prever}
# package.xml is V2
mv ../package.xml %{name}.xml
-# converting to unix format mandatory for old patch version
-sed -i -e 's/\r//' CAS.php
-%patch0 -p1 -b .systemlib
-
%build
cd %{pear_name}-%{version}%{?prever}
@@ -56,15 +53,13 @@ cd %{pear_name}-%{version}%{?prever}
%install
-rm -rf $RPM_BUILD_ROOT docdir
+rm -rf $RPM_BUILD_ROOT
cd %{pear_name}-%{version}%{?prever}
PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
-
-# Move documentation
-mv $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name} ../docdir
-for fic in ../docdir/docs/examples/example*.php; do
- sed -i -e 's/\r//' $fic
+# Fix documentation
+for fic in $RPM_BUILD_ROOT%{pear_docdir}/%{pear_name}/docs/examples/example*.php; do
+ sed -i -e 's/\r//' $fic
done
# Clean up unnecessary files
@@ -92,13 +87,21 @@ fi
%files
%defattr(-,root,root,-)
-%doc docdir/docs/*
+%doc %{pear_docdir}/%{pear_name}
+%doc docs LICENSE
%{pear_xmldir}/%{name}.xml
%{pear_phpdir}/CAS
%{pear_phpdir}/CAS.php
%changelog
+* Sat Jun 11 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.2.2-1
+- update to Version 1.2.2 (stable) - API 1.2.2 (stable)
+
+- dont requires domxml-php4-to-php5 anymore
+- fix URL
+- link %%doc to pear_docdir
+
* Mon Oct 04 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.1.3-1
- update to 1.1.3
- fix CVE-2010-3690, CVE-2010-3691, CVE-2010-3692
diff --git a/sources b/sources
index 041f35c..cb24cc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f1737313ceea5fd6c0c8f763fa7e247 CAS-1.1.3.tgz
+c3e09e99bb28784b68c461ccb1400566 CAS-1.2.2.tgz
More information about the scm-commits
mailing list