diff --git a/.cvsignore b/.cvsignore index 6d16259..4187043 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -CAS-1.1.0.tgz +CAS-1.1.1.tgz diff --git a/php-pear-CAS-systemlibs.patch b/php-pear-CAS-systemlibs.patch index 4807636..44b89f2 100644 --- a/php-pear-CAS-systemlibs.patch +++ b/php-pear-CAS-systemlibs.patch @@ -1,32 +1,32 @@ -diff -up CAS-1.1.0/CAS.php.systemlib CAS-1.1.0/CAS.php ---- CAS-1.1.0/CAS.php.systemlib 1970-01-01 10:13:08.000000000 +0100 -+++ CAS-1.1.0/CAS.php 2010-05-20 07:24:32.000000000 +0200 -@@ -14,7 +14,7 @@ if (!$_SERVER['REQUEST_URI']) { - // another one by Vangelis Haniotakis also to make phpCAS work with PHP5 - // - if (version_compare(PHP_VERSION,'5','>=')) { -- require_once(dirname(__FILE__).'/CAS/domxml-php4-to-php5.php'); -+ require_once('/usr/share/php/domxml-php4-php5/domxml-php4-to-php5.php'); - } - - /** -diff -up CAS-1.1.0/php-pear-CAS.xml.systemlib CAS-1.1.0/php-pear-CAS.xml ---- CAS-1.1.0/php-pear-CAS.xml.systemlib 1970-01-01 10:13:08.000000000 +0100 -+++ CAS-1.1.0/php-pear-CAS.xml 2010-05-20 07:28:39.000000000 +0200 +diff -up CAS-1.1.1/CAS.php.systemlib CAS-1.1.1/CAS.php +--- CAS-1.1.1/CAS.php.systemlib 2010-05-20 19:51:33.000000000 +0200 ++++ CAS-1.1.1/CAS.php 2010-05-20 19:51:27.000000000 +0200 +@@ -40,7 +40,7 @@ if (!$_SERVER['REQUEST_URI']) { + // another one by Vangelis Haniotakis also to make phpCAS work with PHP5 + // + if (version_compare(PHP_VERSION, '5', '>=')) { +- require_once (dirname(__FILE__) . '/CAS/domxml-php4-to-php5.php'); ++ require_once('/usr/share/php/domxml-php4-php5/domxml-php4-to-php5.php'); + } + + /** +diff -up CAS-1.1.1/php-pear-CAS.xml.systemlib CAS-1.1.1/php-pear-CAS.xml +--- CAS-1.1.1/php-pear-CAS.xml.systemlib 1970-01-01 10:13:08.000000000 +0100 ++++ CAS-1.1.1/php-pear-CAS.xml 2010-05-20 19:51:46.000000000 +0200 @@ -51,7 +51,6 @@ see http://www.ja-sig.org/wiki/display/C - - - + + + - - - - -@@ -191,7 +190,7 @@ see http://www.ja-sig.org/wiki/display/C - + + + +@@ -192,7 +191,7 @@ see http://www.ja-sig.org/wiki/display/C + -- -+ +- ++ diff --git a/php-pear-CAS.spec b/php-pear-CAS.spec index d21628f..a793444 100644 --- a/php-pear-CAS.spec +++ b/php-pear-CAS.spec @@ -5,7 +5,7 @@ Name: php-pear-CAS -Version: 1.1.0 +Version: 1.1.1 Release: %{?prever:0.}1%{?prever:.}%{?prever}%{?dist} Summary: Central Authentication Service client library in php @@ -41,6 +41,8 @@ This package is a PEAR library for using a Central Authentication Service. mv package.xml %{pear_name}-%{version}%{?prever}/%{name}.xml cd %{pear_name}-%{version}%{?prever} +# converting to unix format mandatory for old patch version +sed -i -e 's/\r//' CAS.php %patch0 -p1 -b .systemlib @@ -93,6 +95,9 @@ fi %changelog +* Thu May 20 2010 Remi Collet - 1.1.1-1 +- update to 1.1.1 + * Thu May 20 2010 Remi Collet - 1.1.0-1 - update to 1.1.0 finale diff --git a/sources b/sources index feb2c7a..224ecd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6343fcd73c347461c6b55fe7ba72ac08 CAS-1.1.0.tgz +2b030865bf1382d5128f8ffbd830631e CAS-1.1.1.tgz