From 5273fb56073df055e52d6727ee0634427a1bacd9 Mon Sep 17 00:00:00 2001
From: bojan <bojan@fedoraproject.org>
Date: Mar 11 2010 02:27:27 +0000
Subject: Bump up to 1.1.4.


---

diff --git a/.cvsignore b/.cvsignore
index be20b0a..b69b416 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-viewvc-1.1.3.tar.gz
+viewvc-1.1.4.tar.gz
diff --git a/sources b/sources
index ce55bd9..20cc08b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e74127b9193e2bfc48f6242049701d91  viewvc-1.1.3.tar.gz
+af1057d9128b983f4e905615b84486a3  viewvc-1.1.4.tar.gz
diff --git a/viewvc-1.1.3-config.patch b/viewvc-1.1.3-config.patch
deleted file mode 100644
index 24b29d9..0000000
--- a/viewvc-1.1.3-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- branches/1.1.x/lib/config.py	2010-01-07 07:56:29-0800	2316
-+++ branches/1.1.x/lib/config.py	2010-01-07 08:08:31-0800	2317
-@@ -274,9 +274,7 @@
-     """Overlay per-root options for ROOTNAME atop the existing option
-     set.  This is a destructive change to the configuration."""
- 
--    # We can only deal with this happening once!
--    assert(self.root_options_overlayed == 0)
--    self.root_options_overlayed = 1
-+    did_overlay = 0
-     
-     if not self.conf_path:
-       return
-@@ -285,7 +283,17 @@
-       base_section = self._is_allowed_override(self.parser, 'root',
-                                                rootname, section)
-       if base_section:
-+        # We can currently only deal with root overlays happening
-+        # once, so check that we've not yet done any overlaying of
-+        # per-root options.
-+        assert(self.root_options_overlayed == 0)
-         self._process_section(self.parser, section, base_section)
-+        did_overlay = 1
-+
-+    # If we actually did any overlaying, remember this fact so we
-+    # don't do it again later.
-+    if did_overlay:
-+      self.root_options_overlayed = 1
- 
-   def _get_parser_items(self, parser, section):
-     """Basically implement ConfigParser.items() for pre-Python-2.3 versions."""
diff --git a/viewvc.spec b/viewvc.spec
index c643802..f5bfba9 100644
--- a/viewvc.spec
+++ b/viewvc.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           viewvc
-Version:        1.1.3
-Release:        2%{?dist}
+Version:        1.1.4
+Release:        1%{?dist}
 Summary:        Browser interface for CVS and SVN version control repositories
 
 Group:          Development/Tools
@@ -12,7 +12,6 @@ Source0:        http://www.viewvc.org/%{name}-%{version}.tar.gz
 Source1:        viewvc.conf
 Source2:        README.httpd
 Source3:        viewvc-lexer-mimetypes.py
-Patch1:         viewvc-1.1.3-config.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Obsoletes:      %{name}-selinux < 1.0.3-13
@@ -44,7 +43,6 @@ with decent performance when run under Apache.
 
 %prep
 %setup -q
-%patch1 -p2 -b .config
 
 %build
 
@@ -120,6 +118,9 @@ with decent performance when run under Apache.
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/viewvc.conf
 
 %changelog
+* Thu Mar 11 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.4-1
+- bump up to 1.1.4
+
 * Fri Jan  8 2010 Bojan Smojver <bojan@rexursive.com> - 1.1.3-2
 - patch upstream issue #445