rpms/websvn/F-10 websvn-2.2.0-use_system_libs.patch, NONE, 1.1 websvn-httpd.conf, NONE, 1.1 websvn.spec, NONE, 1.1 sources, 1.1, 1.2
Xavier Bachelot
xavierb at fedoraproject.org
Wed Jun 3 19:08:01 UTC 2009
- Previous message (by thread): rpms/websvn/EL-5 websvn-2.2.0-use_system_libs.patch, NONE, 1.1 websvn-httpd.conf, NONE, 1.1 websvn.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/websvn/F-11 websvn-2.2.0-use_system_libs.patch, NONE, 1.1 websvn-httpd.conf, NONE, 1.1 websvn.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: xavierb
Update of /cvs/pkgs/rpms/websvn/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22463/F-10
Modified Files:
sources
Added Files:
websvn-2.2.0-use_system_libs.patch websvn-httpd.conf
websvn.spec
Log Message:
Import into F-10, F-11, EL-4 and EL-5
websvn-2.2.0-use_system_libs.patch:
--- NEW FILE websvn-2.2.0-use_system_libs.patch ---
diff -Naur websvn-2.2.0.orig/include/svnlook.php websvn-2.2.0/include/svnlook.php
--- websvn-2.2.0.orig/include/svnlook.php 2009-04-06 14:41:40.000000000 +0200
+++ websvn-2.2.0/include/svnlook.php 2009-04-23 10:44:56.000000000 +0200
@@ -695,7 +695,7 @@
foreach ($extGeshi as $lang => $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;
@@ -732,7 +732,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.2.0.orig/rss.php websvn-2.2.0/rss.php
--- websvn-2.2.0.orig/rss.php 2009-02-20 16:38:29.000000000 +0100
+++ websvn-2.2.0/rss.php 2009-04-23 10:45:39.000000000 +0200
@@ -22,7 +22,7 @@
//
// Creates an rss feed for the given repository number
-include('lib/feedcreator.class.php');
+include('feedcreator.class.php');
require_once('include/setup.php');
require_once('include/svnlook.php');
diff -Naur websvn-2.2.0.orig/wsvn.php websvn-2.2.0/wsvn.php
--- websvn-2.2.0.orig/wsvn.php 2009-04-23 10:42:41.000000000 +0200
+++ websvn-2.2.0/wsvn.php 2009-04-23 10:45:39.000000000 +0200
@@ -47,7 +47,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");
--- NEW FILE websvn-httpd.conf ---
Alias /websvn /usr/share/websvn/
<Directory /usr/share/websvn/>
Options MultiViews
DirectoryIndex wsvn.php
order deny,allow
deny from all
allow from 127.0.0.1
</Directory>
--- NEW FILE websvn.spec ---
Name: websvn
Version: 2.2.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
Source1: websvn-httpd.conf
Patch1: websvn-2.2.0-use_system_libs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires(pre): httpd
Requires: sed
Requires: enscript
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)
%description
WebSVN offers a view onto your subversion repositories that's been designed to
reflect the Subversion methodology. You can view the log of any file or
directory and see a list of all the files changed, added or deleted in any
given revision. You can also view the differences between two versions of a
file so as to see exactly what was changed in a particular revision.
%prep
%setup -q
### Let websvn use the system provided php classes and remove bundled ones.
%patch1 -p1
rm -rf lib/
mv include/distconfig.php include/config.php
find templates/calm -type f -exec chmod -R a-x {} ';'
sed -i -e 's/\r//' doc/style.css
iconv -f iso8859-1 -t utf-8 changes.txt > changes.txt.conv \
&& touch -r changes.txt changes.txt.conv \
&& mv -f changes.txt.conv changes.txt
sed -i -e "s#^\$locwebsvnhttp = '';#\$locwebsvnhttp = '/websvn';#" wsvn.php
sed -i -e "s#^\/\/ \$config->useMultiViews();#\$config->useMultiViews();#" \
include/config.php
%build
# Nothing to build
%install
rm -rf $RPM_BUILD_ROOT
# Install the code
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
cp -a *.php include languages templates $RPM_BUILD_ROOT/%{_datadir}/%{name}
# Move the conf to the proper place
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
mv $RPM_BUILD_ROOT/%{_datadir}/%{name}/include/config.php \
$RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
ln -s ../../../..%{_sysconfdir}/%{name}/config.php \
$RPM_BUILD_ROOT/%{_datadir}/%{name}/include/config.php
# Apache conf
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d
install -m 0644 %{SOURCE1} \
$RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
# Move the cache dir to a better place
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/cache/%{name}
ln -s ../../..%{_localstatedir}/cache/%{name} \
$RPM_BUILD_ROOT/%{_datadir}/%{name}/cache
# Move the temp dir to a better place
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/tmp
ln -s ../../..%{_localstatedir}/tmp $RPM_BUILD_ROOT/%{_datadir}/%{name}/temp
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc changes.txt license.txt doc/
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%config(noreplace) %{_sysconfdir}/%{name}/config.php
%{_datadir}/%{name}
%attr(-,apache,root) %{_localstatedir}/cache/%{name}
%changelog
* Fri May 22 2009 Xavier Bachelot <xavier at bachelot.org> 2.2.1-1
- Update to 2.2.1.
- Preserve time stamp when fixing encoding.
* Sat May 09 2009 Xavier Bachelot <xavier at bachelot.org> 2.2.0-2
- php-pear(Text_Diff) is mandatory now.
- Add Requires(pre): httpd.
* Thu Apr 23 2009 Xavier Bachelot <xavier at bachelot.org> 2.2.0-1
- Update to 2.2.0.
- Actually use the system provided classes.
- Add Requires: php-pear(Archive_Tar).
- Remove implicit Requires: php-common.
* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 2.1.0-3
- Turn multiview on by default.
* Thu Mar 26 2009 Xavier Bachelot <xavier at bachelot.org> 2.1.0-2
- More Requires:.
- Move temp and cache dir to a better place.
- Set a proper locwebsvnhttp in wsvn.php.
* Wed Mar 18 2009 Xavier Bachelot <xavier at bachelot.org> 2.1.0-1
- Initial build.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/websvn/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 3 Jun 2009 16:53:46 -0000 1.1
+++ sources 3 Jun 2009 19:07:30 -0000 1.2
@@ -0,0 +1 @@
+f7eb3d57840aa3d1917bb0c645794601 websvn-2.2.1.tar.gz
- Previous message (by thread): rpms/websvn/EL-5 websvn-2.2.0-use_system_libs.patch, NONE, 1.1 websvn-httpd.conf, NONE, 1.1 websvn.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/websvn/F-11 websvn-2.2.0-use_system_libs.patch, NONE, 1.1 websvn-httpd.conf, NONE, 1.1 websvn.spec, NONE, 1.1 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list