From ff2b42a3633a835f559aed2db2d5463ba7fab8b3 Mon Sep 17 00:00:00 2001
From: Miloslav Trmac <mitr@fedoraproject.org>
Date: Jul 31 2009 00:35:23 +0000
Subject: - Update to sigul-0.97.

- Ship NEWS.

---

diff --git a/.cvsignore b/.cvsignore
index a496801..da609af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-sigul-0.96.tar.bz2
+sigul-0.97.tar.bz2
diff --git a/0001-Handle-signing-of-source-rpms.patch b/0001-Handle-signing-of-source-rpms.patch
deleted file mode 100644
index d27d408..0000000
--- a/0001-Handle-signing-of-source-rpms.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9502326ec4d0f7442fbb3dfc630b30bc3e711a04 Mon Sep 17 00:00:00 2001
-From: Jesse Keating <jkeating@redhat.com>
-Date: Fri, 24 Jul 2009 16:10:17 -0700
-Subject: [PATCH] Handle signing of source rpms.
-
-Source RPM 'arch' in the header can either be noarch, or the arch
-of the host preparing the srpm.  Therefor we need to detect a srpm
-and react accordingly.
----
- src/server.py |    8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/src/server.py b/src/server.py
-index 4e554bd..9d2bce3 100644
---- a/src/server.py
-+++ b/src/server.py
-@@ -986,7 +986,13 @@ def cmd_sign_rpm(db, conn):
-         field_value = conn.safe_outer_field(field)
-         if field_value is None:
-             continue
--        rpm_value = hdr[tag]
-+        # rpm arch for srpms is noarch or the arch prepared on.  Therefor
-+        # check to see if sourcepage is 1
-+        if field_value == 'src':
-+            if hdr['sourcepackage'] == 1:
-+                rpm_value = 'src'
-+        else:
-+            rpm_value = hdr[tag]
-         if rpm_value is None:
-             rpm_value = ''
-         if field_value != rpm_value:
--- 
-1.6.2.5
-
diff --git a/0002-Temporary-workaround-for-accidentially-re-downloadin.patch b/0002-Temporary-workaround-for-accidentially-re-downloadin.patch
deleted file mode 100644
index 5030ffc..0000000
--- a/0002-Temporary-workaround-for-accidentially-re-downloadin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 32d4a140dc9a8d18604386ba08de911bef34c8f0 Mon Sep 17 00:00:00 2001
-From: Jesse Keating <jkeating@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..32343ed 100644
---- a/src/bridge.py
-+++ b/src/bridge.py
-@@ -331,7 +331,7 @@ class SignRpmRequestType(RequestType):
-         # attempts to initialize nss with our certificate database.
-         import koji
- 
--        if self.__koji_rpm_info is None:
-+        if True:
-             try:
-                 d = {'name': self.__request_fields['rpm-name'],
-                      'version': self.__request_fields['rpm-version'],
--- 
-1.6.2.5
-
diff --git a/sigul.spec b/sigul.spec
index 3d2b3c1..1626e16 100644
--- a/sigul.spec
+++ b/sigul.spec
@@ -1,11 +1,10 @@
 Summary: A signing server and related software client
 Name: sigul
-Version: 0.96
-Release: 6%{?dist}
+Version: 0.97
+Release: 1%{?dist}
 License: GPLv2
 Group: Applications/Internet
 URL: https://fedorahosted.org/sigul/
-# Source may not be uploaded yet
 Source0: https://fedorahosted.org/releases/s/i/sigul/sigul-%{version}.tar.bz2
 Source1: sigul_bridge.init
 Source2: sigul_server.init
@@ -25,8 +24,6 @@ BuildRequires: python
 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
@@ -35,8 +32,6 @@ that connects the two.
 
 %prep
 %setup -q
-%patch0 -p1 
-%patch1 -p1 
 
 %build
 %configure
@@ -80,7 +75,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING NEWS README
 %dir %{_sysconfdir}/sigul
 %config(noreplace) %{_sysconfdir}/sigul/client.conf
 %config(noreplace) %attr(640,root,sigul) %{_sysconfdir}/sigul/bridge.conf
@@ -96,6 +91,10 @@ fi
 %dir %attr(700,sigul,sigul) %{_localstatedir}/lib/sigul/gnupg
 
 %changelog
+* Fri Jul 31 2009 Miloslav Trmač <mitr@redhat.com> - 0.97-1
+- Update to sigul-0.97.
+- Ship NEWS.
+
 * Tue Jul 28 2009 Jesse Keating <jkeating@redhat.com> - 0.96-6
 - Fix the patch in -4
 
diff --git a/sources b/sources
index 6ed2023..5717eef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-faa8e4fd42d01ac08888ec9a88932820  sigul-0.96.tar.bz2
+dc840745fd3bd6795065c29e43ff00e8  sigul-0.97.tar.bz2