rpms/viewvc/F-10 sources, 1.8, 1.9 viewvc.spec, 1.15, 1.16 viewvc-allow-tar.patch, 1.1, NONE viewvc-temp-location.patch, 1.1, NONE
bojan
bojan at fedoraproject.org
Fri Sep 4 06:54:36 UTC 2009
Author: bojan
Update of /cvs/pkgs/rpms/viewvc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29403
Modified Files:
sources viewvc.spec
Removed Files:
viewvc-allow-tar.patch viewvc-temp-location.patch
Log Message:
Bump up to 1.1.2.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources 11 Aug 2009 21:56:32 -0000 1.8
+++ sources 4 Sep 2009 06:54:36 -0000 1.9
@@ -1 +1 @@
-5aa48bb866f65bfcf32aa0cd581bf7d3 viewvc-1.0.9.tar.gz
+8f14fc2f58f4e87b835500ae20d8d631 viewvc-1.1.2.tar.gz
Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/F-10/viewvc.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- viewvc.spec 11 Aug 2009 21:56:32 -0000 1.15
+++ viewvc.spec 4 Sep 2009 06:54:36 -0000 1.16
@@ -1,22 +1,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-# EL4 & EL5 do not have cvsgraph or enscript.. yet
-%if 0%{?rhel}
-%define with_cvsgraph_enscript 0
-%else
-%define with_cvsgraph_enscript 1
-%endif
-
-# EL4 has a subversion that does not meet the minimum reqs for subversion
-%if 0%{?rhel} && "%rhel" < "5"
-%define with_subversion 0
-%else
-%define with_subversion 1
-%endif
-
-
Name: viewvc
-Version: 1.0.9
+Version: 1.1.2
Release: 1%{?dist}
Summary: Browser interface for CVS and SVN version control repositories
@@ -26,22 +11,18 @@ URL: http://www.viewvc.org/
Source0: http://www.viewvc.org/%{name}-%{version}.tar.gz
Source1: viewvc.conf
Source2: README.httpd
-Patch0: viewvc-temp-location.patch
-Patch1: viewvc-allow-tar.patch
+Source3: viewvc-lexer-mimetypes.py
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: %{name}-selinux < 1.0.3-13
Conflicts: selinux-policy < 2.5.10-2
BuildArch: noarch
-BuildRequires: python-devel >= 2.0
+BuildRequires: python-devel >= 2.0, python-pygments
Requires: webserver, rcs, diffutils
-%if 0%{with_subversion}
Requires: subversion >= 1.2
-%endif
-%if 0%{with_cvsgraph_enscript}
-Requires: enscript, cvsgraph
-%endif
+Requires: cvsgraph
+Requires: python-pygments
%description
ViewVC is a browser interface for CVS and Subversion version control
@@ -51,10 +32,6 @@ as well as diffs between those versions.
of the report-like functionality you expect out of your version control tool,
but much more prettily than the average textual command-line program output.
-%if 0%{!?with_subversion}
-This version only supports CVS repositories.
-%endif
-
%package httpd
Summary: ViewVC configuration for Apache/mod_python
Group: Development/Tools
@@ -66,8 +43,6 @@ with decent performance when run under A
%prep
%setup -q
-%patch0 -p0 -b .temp-location
-%patch1 -p0 -b .allow-tar
%build
@@ -94,24 +69,21 @@ with decent performance when run under A
# Fix paths in configuration
%{__perl} -pi \
- -e 's|templates/|%{_datadir}/viewvc/templates/|g;' \
- -e 's|^template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
- -e 's|^#docroot = .*|docroot = /viewvc-static|;' \
- -e 's|^cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+ -e 's|^#* *template_dir = .*|template_dir = %{_datadir}/viewvc/templates|g;' \
+ -e 's|^#* *docroot = .*|docroot = /viewvc-static|;' \
+ -e 's|^#* *cvsgraph_conf = .*|cvsgraph_conf = %{_sysconfdir}/viewvc/cvsgraph.conf|;' \
+ -e 's|^#* *use_cvsgraph = .*|use_cvsgraph = 1|;' \
%{buildroot}%{python_sitelib}/viewvc/viewvc.conf
-%if 0%{with_cvsgraph_enscript}
-%{__perl} -pi \
- -e 's|^use_cvsgraph = .*|use_cvsgraph = 1|;' \
- -e 's|^use_enscript = .*|use_enscript = 1|;' \
- %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
-%endif
-
# Install config to sysconf directory
%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/viewvc.conf %{buildroot}%{_sysconfdir}/viewvc/viewvc.conf
%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/viewvc.conf
%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf %{buildroot}%{_sysconfdir}/viewvc/cvsgraph.conf
%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/cvsgraph.conf
+%{__install} -Dp -m0644 %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
+%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/mimetypes.conf
+
+%{SOURCE3} >> %{buildroot}%{_sysconfdir}/viewvc/mimetypes.conf
# Install Apache configuration and README
%{__sed} -e s,__datadir__,%{_datadir}, \
@@ -127,9 +99,6 @@ with decent performance when run under A
%{__mv} %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/viewvc.py \
%{buildroot}%{python_sitelib}/viewvc/bin/mod_python/viewvc-mp.py
-# Kill patch backup file
-%{__rm} -f %{buildroot}%{python_sitelib}/viewvc/lib/viewvc.py.temp-location
-
# Make spool directory for temp files
%{__mkdir} -p %{buildroot}%{_localstatedir}/spool/viewvc
@@ -138,7 +107,7 @@ with decent performance when run under A
%files
%defattr(-, root, root, -)
-%doc CHANGES README README.httpd INSTALL TODO COMMITTERS LICENSE.html docs
+%doc CHANGES README README.httpd INSTALL COMMITTERS LICENSE.html docs
%config(noreplace) %{_sysconfdir}/viewvc
%{python_sitelib}/*
%{_datadir}/*
@@ -149,6 +118,9 @@ with decent performance when run under A
%config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
%changelog
+* Fri Sep 4 2009 Bojan Smojver <bojan at rexursive.com> - 1.1.2-1
+- bump up to 1.1.2
+
* Wed Aug 12 2009 Bojan Smojver <bojan at rexursive.com> - 1.0.9-1
- bump up to 1.0.9
- security fix: validate the 'view' parameter to avoid XSS attack
--- viewvc-allow-tar.patch DELETED ---
--- viewvc-temp-location.patch DELETED ---
More information about the scm-commits
mailing list