rpms/websvn/EL-6 websvn-2.3.1-use_system_libs.patch, NONE, 1.1 sources, 1.2, 1.3 websvn.spec, 1.2, 1.3 websvn-2.2.0-use_system_libs.patch, 1.1, NONE

[Xavier Bachelot]

Author: xavierb

Update of /cvs/pkgs/rpms/websvn/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14612

Modified Files:
	sources websvn.spec 
Added Files:
	websvn-2.3.1-use_system_libs.patch 
Removed Files:
	websvn-2.2.0-use_system_libs.patch 
Log Message:
update to 2.3.1

websvn-2.3.1-use_system_libs.patch:
 include/svnlook.php |    4 ++--
 wsvn.php            |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE websvn-2.3.1-use_system_libs.patch ---
diff -Naur websvn-2.3.1.orig/include/svnlook.php websvn-2.3.1/include/svnlook.php
--- websvn-2.3.1.orig/include/svnlook.php	2010-06-14 22:02:31.026951493 +0200
+++ websvn-2.3.1/include/svnlook.php	2010-06-14 22:04:28.214951302 +0200
@@ -629,7 +629,7 @@
 		foreach ($extGeshi as $language => $extensions) {
 			if (in_array($ext, $extensions)) {
 				if ($this->geshi === null) {
-					require_once 'lib/geshi.php';
+					require_once 'geshi.php';
 					$this->geshi = new GeSHi();
 				} else {
 					$this->geshi->error = false;
@@ -673,7 +673,7 @@
 
 		$source = file_get_contents($filename);
 		if ($this->geshi === null) {
-			require_once 'lib/geshi.php';
+			require_once 'geshi.php';
 			$this->geshi = new GeSHi();
 		}
 		$this->geshi->set_source($source);
diff -Naur websvn-2.3.1.orig/wsvn.php websvn-2.3.1/wsvn.php
--- websvn-2.3.1.orig/wsvn.php	2010-06-14 22:02:31.036951097 +0200
+++ websvn-2.3.1/wsvn.php	2010-06-14 22:06:44.534701620 +0200
@@ -45,7 +45,7 @@
 	define('WSVN_MULTIVIEWS', 1);
 }
 
-ini_set('include_path', $locwebsvnreal);
+ini_set('include_path', ini_get('include_path').":".$locwebsvnreal);
 
 require_once 'include/setup.php';
 require_once 'include/svnlook.php';


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/websvn/EL-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Jun 2009 18:48:57 -0000	1.2
+++ sources	6 Jul 2010 22:11:18 -0000	1.3
@@ -1 +1 @@
-f7eb3d57840aa3d1917bb0c645794601  websvn-2.2.1.tar.gz
+5997e043a8c4fd8b25cb9f4025773cad  websvn-2.3.1.tar.gz


Index: websvn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/websvn/EL-6/websvn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- websvn.spec	27 Jul 2009 07:09:22 -0000	1.2
+++ websvn.spec	6 Jul 2010 22:11:18 -0000	1.3
@@ -1,14 +1,14 @@
 Name:           websvn
-Version:        2.2.1
-Release:        2%{?dist}
+Version:        2.3.1
+Release:        1%{?dist}
 Summary:        Online subversion repository browser
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.websvn.info
-Source0:        http://websvn.tigris.org/files/documents/1380/45918/websvn-2.2.1.tar.gz
+Source0:        http://websvn.tigris.org/files/documents/1380/47525/websvn-2.3.1.tar.gz
 Source1:        websvn-httpd.conf
-Patch1:         websvn-2.2.0-use_system_libs.patch
+Patch1:         websvn-2.3.1-use_system_libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -19,7 +19,6 @@ Requires:       php >= 4.3.0
 Requires:       php-mbstring
 Requires:       php-xml
 Requires:       php-geshi
-Requires:       php-feedcreator
 Requires:       php-pear(Archive_Tar)
 Requires:       php-pear(Text_Diff)
 
@@ -96,6 +95,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 15 2010 Xavier Bachelot <xavier at bachelot.org> 2.3.1-1
+- Update to 2.3.1.
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- websvn-2.2.0-use_system_libs.patch DELETED ---