rpms/viewvc/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 viewvc.spec, 1.12, 1.13 viewvc-temp-location.patch, 1.1, NONE

[Bojan Smojver]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20035

Modified Files:
	.cvsignore sources viewvc.spec 
Removed Files:
	viewvc-temp-location.patch 
Log Message:
Rework for 1.1.x beta.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	14 Oct 2008 23:41:21 -0000	1.6
+++ .cvsignore	7 Nov 2008 19:46:16 -0000	1.7
@@ -1 +1 @@
-viewvc-1.0.7.tar.gz
+viewvc-1.1.0-beta1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	14 Oct 2008 23:41:22 -0000	1.6
+++ sources	7 Nov 2008 19:46:16 -0000	1.7
@@ -1 +1 @@
-cfc8c51418114704c23de64f8e6c04dd  viewvc-1.0.7.tar.gz
+62fa6096ca01d1999658cdd1c8909d3f  viewvc-1.1.0-beta1.tar.gz


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- viewvc.spec	26 Oct 2008 23:50:36 -0000	1.12
+++ viewvc.spec	7 Nov 2008 19:46:16 -0000	1.13
@@ -1,32 +1,18 @@
 %{!?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
-
+%define betaversion beta1
 
 Name:           viewvc
-Version:        1.0.7
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        0.%{betaversion}.1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://www.viewvc.org/
-Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
+Source0:        http://www.viewvc.org/%{name}-%{version}-%{betaversion}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
-Patch0:         viewvc-temp-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -35,12 +21,9 @@
 BuildArch:      noarch
 BuildRequires:  python-devel >= 2.0
 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
@@ -50,10 +33,6 @@
 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
@@ -64,8 +43,10 @@
 with decent performance when run under Apache.
 
 %prep
-%setup -q
-%patch0 -p0 -b .temp-location
+%setup -q -n %{name}-%{version}-%{betaversion}
+cd ..
+%{__ln_s} %{name}-%{version}-%{betaversion} %{name}-%{version}
+cd %{name}-%{version}
 
 %build
 
@@ -92,18 +73,11 @@
 
 # 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|;' \
-  %{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
@@ -136,7 +110,7 @@
 
 %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}/*
@@ -147,6 +121,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Nov  6 2008 Bojan Smojver <bojan at rexursive.com> - 1.1.0-0.beta1.1
+- Rebase to 1.1.x
+
 * Mon Oct 27 2008 Bojan Smojver <bojan at rexursive.com> - 1.0.7-2
 - Depend on webserver to avoid pulling in Apache/mod_python (bug #457691)
 - Provide viewvc-httpd package for mod_python specific configuration


--- viewvc-temp-location.patch DELETED ---