rpms/viewvc/devel viewvc.conf,1.1,1.2 viewvc.spec,1.7,1.8

[Bojan Smojver (bojan)]

Author: bojan

Update of /cvs/pkgs/rpms/viewvc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8213

Modified Files:
	viewvc.conf viewvc.spec 
Log Message:
Temporary fix for import cycle errors.



Index: viewvc.conf
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- viewvc.conf	9 Mar 2007 03:38:33 -0000	1.1
+++ viewvc.conf	3 Jun 2007 05:34:14 -0000	1.2
@@ -1,10 +1,9 @@
-Alias /viewvc __python_sitelib__/viewvc/bin/mod_python/viewvc.py
+Alias /viewvc __python_sitelib__/viewvc/bin/mod_python/viewvc-mp.py
 Alias /viewvc-static __datadir__/viewvc/templates/docroot
 
 <Directory __python_sitelib__/viewvc/bin/mod_python>
     AddHandler python-program .py
     PythonHandler handler
-    PythonPath "sys.path+['__python_sitelib__/viewvc/bin/mod_python']"
     Order allow,deny
     Allow from 127.0.0.1
 </Directory>


Index: viewvc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/viewvc/devel/viewvc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- viewvc.spec	15 May 2007 06:57:02 -0000	1.7
+++ viewvc.spec	3 Jun 2007 05:34:14 -0000	1.8
@@ -17,7 +17,7 @@
 
 Name:           viewvc
 Version:        1.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -111,6 +111,13 @@
 # make rpmlint happy!
 %{__chmod} 0644 %{buildroot}%{python_sitelib}/viewvc/bin/mod_python/*.py
 
+# Rename viewvc.py to viewvc-mp.py for mod_python to avoid import cycle errors
+%{__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
 
@@ -127,6 +134,9 @@
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Sun Jun  3 2007 Bojan Smojver <bojan at rexursive.com> - 1.0.4-2
+- Avoid import cycle errors (temporary fix)
+
 * Tue May 15 2007 Bojan Smojver <bojan at rexursive.com> - 1.0.4-1
 - Bump up to 1.0.4