[php-pear-CAS] update to 1.2.0

Remi Collet remi at fedoraproject.org
Thu Jan 20 16:50:59 UTC 2011


commit 111100f0bae751967aa1f1f18e15b21e83b72079
Author: remi <fedora at famillecollet.com>
Date:   Thu Jan 20 17:50:47 2011 +0100

    update to 1.2.0

 .gitignore                    |    1 +
 php-pear-CAS-systemlibs.patch |   32 --------------------------------
 php-pear-CAS.spec             |   37 ++++++++++++++++++++-----------------
 sources                       |    2 +-
 4 files changed, 22 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 03f1dde..eea800a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ package-*.xml
 CAS-1.1.1.tgz
 CAS-1.1.2.tgz
 /CAS-1.1.3.tgz
+/CAS-1.2.0.tgz
diff --git a/php-pear-CAS.spec b/php-pear-CAS.spec
index 3f5c11d..69d58cc 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.0
 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
@@ -24,7 +22,7 @@ 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-xml >= 5.0.0
 Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
 # this library is mostly known as phpCAS
 Provides:       phpCAS = %{version}-%{release}
@@ -41,14 +39,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 +54,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 +88,20 @@ 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
+* Thu Jan 20 2011 Remi Collet <Fedora at FamilleCollet.com> - 1.2.0-1
+- update to Version 1.2.0 (stable) - API 1.2.0 (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..7e0bbb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f1737313ceea5fd6c0c8f763fa7e247  CAS-1.1.3.tgz
+054bcd609e34f22731cb5b583b853300  CAS-1.2.0.tgz


More information about the scm-commits mailing list