From 18430e50794e77475728f0b7617807f4838c7eb7 Mon Sep 17 00:00:00 2001
From: bojan <bojan@fedoraproject.org>
Date: Jun 03 2007 05:32:51 +0000
Subject: Temporary fix for import cycle errors.


---

diff --git a/viewvc.conf b/viewvc.conf
index 094777b..4f41917 100644
--- a/viewvc.conf
+++ b/viewvc.conf
@@ -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>
diff --git a/viewvc.spec b/viewvc.spec
index 8c5c5b2..a90bb47 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -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 @@ This version only supports CVS repositories.
 # 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 @@ This version only supports CVS repositories.
 %attr(0700,apache,apache) %{_localstatedir}/spool/viewvc
 
 %changelog
+* Sun Jun  3 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.4-2
+- Avoid import cycle errors (temporary fix)
+
 * Tue May 15 2007 Bojan Smojver <bojan@rexursive.com> - 1.0.4-1
 - Bump up to 1.0.4