diff --git a/.gitignore b/.gitignore index 00722d8..a0a41db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ websvn-2.3.1.tar.gz /websvn-2.3.2.tar.gz +/websvn-2.3.3.tar.gz diff --git a/sources b/sources index d450260..68cb61b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -221b858690ca1fbf41ed32cb10667bd3 websvn-2.3.2.tar.gz +bc1821caf77a3225aa810e8f19400ea6 websvn-2.3.3.tar.gz diff --git a/websvn-2.3.1-use_system_libs.patch b/websvn-2.3.1-use_system_libs.patch deleted file mode 100644 index f92dda2..0000000 --- a/websvn-2.3.1-use_system_libs.patch +++ /dev/null @@ -1,33 +0,0 @@ -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'; diff --git a/websvn-2.3.3-use_system_libs.patch b/websvn-2.3.3-use_system_libs.patch new file mode 100644 index 0000000..5393c79 --- /dev/null +++ b/websvn-2.3.3-use_system_libs.patch @@ -0,0 +1,33 @@ +diff -Naur websvn-2.3.3.orig/include/svnlook.php websvn-2.3.3/include/svnlook.php +--- websvn-2.3.3.orig/include/svnlook.php 2011-06-27 11:12:51.000000000 +0200 ++++ websvn-2.3.3/include/svnlook.php 2011-06-28 21:36:43.000000000 +0200 +@@ -752,7 +752,7 @@ + foreach ($extGeshi as $language => $extensions) { + if (in_array($filename, $extensions) || 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; +@@ -796,7 +796,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.3.orig/wsvn.php websvn-2.3.3/wsvn.php +--- websvn-2.3.3.orig/wsvn.php 2011-06-28 21:35:45.000000000 +0200 ++++ websvn-2.3.3/wsvn.php 2011-06-28 21:36:43.000000000 +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'; diff --git a/websvn.spec b/websvn.spec index d590487..c2438a2 100644 --- a/websvn.spec +++ b/websvn.spec @@ -1,14 +1,14 @@ Name: websvn -Version: 2.3.2 +Version: 2.3.3 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/48737/websvn-2.3.2.tar.gz +Source0: http://websvn.tigris.org/files/documents/1380/49056/websvn-2.3.3.tar.gz Source1: websvn-httpd.conf -Patch1: websvn-2.3.1-use_system_libs.patch +Patch1: websvn-2.3.3-use_system_libs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -122,6 +122,9 @@ fi %changelog +* Tue Jun 28 2011 Xavier Bachelot 2.3.3-1 +- Update to 2.3.3. + * Tue Mar 01 2011 Xavier Bachelot 2.3.2-1 - Update to 2.3.2.