rpms/sigul/devel 0002-Temporary-workaround-for-accidentially-re-downloadin.patch, NONE, 1.1 import.log, 1.1, 1.2 sigul.spec, 1.1, 1.2

[Jesse Keating]

Author: jkeating

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

Modified Files:
	import.log sigul.spec 
Added Files:
	0002-Temporary-workaround-for-accidentially-re-downloadin.patch 
Log Message:
Integrate fixes found during test deployment in Fedora.


0002-Temporary-workaround-for-accidentially-re-downloadin.patch:
 bridge.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0002-Temporary-workaround-for-accidentially-re-downloadin.patch ---
>From a94667940ac9523b8132f9c003a8f4b4fab6b7af Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at redhat.com>
Date: Tue, 28 Jul 2009 20:06:30 -0700
Subject: [PATCH 2/2] Temporary workaround for accidentially re-downloading stale rpms.

This is causing us to download the same rpm over and over which
really doesn't work well.  This is a temporary work around given
to me by Mitr.
---
 src/bridge.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/bridge.py b/src/bridge.py
index 15f6422..4bda697 100644
--- a/src/bridge.py
+++ b/src/bridge.py
@@ -309,7 +309,7 @@ class SignRpmRequestType(RequestType):
         # attempts to initialize nss with our certificate database.
         import koji
 
-        if self.__koji_session is None:
+        if True:
             try:
                 self.__koji_config = utils.koji_read_config()
                 # self.__request_fields['user'] safety was verified by
-- 
1.6.2.5



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sigul/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	29 Jul 2009 03:14:10 -0000	1.1
+++ import.log	29 Jul 2009 03:17:40 -0000	1.2
@@ -1 +1,2 @@
 sigul-0_96-2:HEAD:sigul-0.96-2.src.rpm:1248837141
+sigul-0_96-4:HEAD:sigul-0.96-4.src.rpm:1248837360


Index: sigul.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sigul/devel/sigul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sigul.spec	29 Jul 2009 03:14:11 -0000	1.1
+++ sigul.spec	29 Jul 2009 03:17:40 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: A signing server and related software client
 Name: sigul
 Version: 0.96
-Release: 2
+Release: 4
 License: GPLv2
 Group: Applications/Internet
 URL: https://fedorahosted.org/sigul/
@@ -11,7 +11,8 @@ Source1: sigul_bridge.init
 Source2: sigul_server.init
 Source3: sigul.logrotate
 Requires: koji, logrotate, m2crypto, pexpect, pygpgme, python, python-fedora,
-Requires: python-nss >= 0.4, python-sqlalchemy, python-sqlite2
+Requires: python-nss >= 0.6
+Requires: python-sqlalchemy, python-sqlite2
 Requires: python-urlgrabber
 # For sigul_setup_client
 Requires: coreutils nss-tools
@@ -25,6 +26,7 @@ BuildRequires: gnupg
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Patch0: 0001-Handle-signing-of-source-rpms.patch
+Patch1: 0002-Temporary-workaround-for-accidentially-re-downloadin.patch
 
 %description
 A signing server, which lets authorized users sign data without having any
@@ -34,6 +36,7 @@ that connects the two.
 %prep
 %setup -q
 %patch0 -p1 
+%patch1 -p1 
 
 %build
 %configure
@@ -93,6 +96,13 @@ fi
 %dir %attr(700,sigul,sigul) %{_localstatedir}/lib/sigul/gnupg
 
 %changelog
+* Tue Jul 28 2009 Jesse Keating <jkeating at redhat.com> - 0.96-4
+- Add another patch to temporarily work around a stale koji issue.
+- Bump python-nss reqs up now that we have a newer one in EPEL
+
+* Mon Jul 27 2009 Jesse Keating <jkeating at redhat.com> - 0.96-3
+- Setup the Requires right for EL5
+
 * Mon Jul 27 2009 Jesse Keating <jkeating at redhat.com> - 0.96-2
 - Fix various bugs while testing (release by Mitr)
 - Patch from jkeating for srpm signing.