update

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=98

debian.changelog

@@ -1,3 +1,8 @@
+osc (0.132.6-1) unstable; urgency=low
+  - Update to 0.132.6
+
+ -- Adrian Schroeter <adrian@suse.de>  Wed, 24 Aug 2011 10:00:00 +0200
+
 osc (0.132.5-1) unstable; urgency=low
   - Update to 0.132.5
 

osc-0.132.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:463f9f4ac96fc744ec0fe4dc6a1816dd159eb1f864692935f95cba081107ed27
-size 269264

osc-0.132.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94a9fc93bb20e9080b9f5e76e08b12d6015a35d5c0c3017633e9ed71513abe0d
+size 269454

osc-pubkey-parsing.patch

@@ -1,40 +0,0 @@
-commit f707e9a22e185098bbea923b7ff8971f19a87991
-Author: Ludwig Nussel <ludwig.nussel@suse.de>
-Date:   Fri Aug 5 13:52:42 2011 +0200
-
-    fix pgp pubkey parsing
-    
-    the base64 checksum must not be included in the key data. Newer rpm
-    don't like that.
-
-diff --git a/osc/checker.py b/osc/checker.py
-index b4149d2..88eb7cc 100644
---- a/osc/checker.py
-+++ b/osc/checker.py
-@@ -61,16 +61,24 @@ class Checker:
- 
-         key = ''
-         line = fd.readline()
-+        crc = None
-         while line:
-             if line[0:12] == "-----END PGP":
-                 break
-             line = line.rstrip()
--            key += line
--            line = fd.readline()
-+            if (line[0] == '='):
-+                crc = line[1:]
-+                line = fd.readline()
-+                break
-+            else:
-+                key += line
-+                line = fd.readline()
-         fd.close()
-         if not line or line[0:12] != "-----END PGP":
-             raise KeyError(file, "not a pgp public key")
- 
-+        # TODO: compute and compare CRC, see RFC 2440
-+
-         bkey = base64.b64decode(key)
- 
-         r = self.ts.pgpImportPubkey(bkey)

osc.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug 25 09:37:44 UTC 2011 - adrian@suse.de
+
+- update to 0.132.6
+   * fix crash on removal of local _service file
+   * handle both old OBS versions before 2.3
+   * fix pgp pubkey parsing
+   * show created incident project
+
 -------------------------------------------------------------------
 Tue Aug 16 13:08:11 UTC 2011 - idonmez@novell.com
 

osc.dsc

@@ -1,6 +1,6 @@
 Format: 1.0
 Source: osc
-Version: 0.132.5
+Version: 0.132.6
 Binary: osc
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: any

osc.spec

@@ -18,14 +18,13 @@
 
 
 Name:           osc
-Version:        0.132.5
-Release:        2
+Version:        0.132.6
+Release:        1
 License:        GPLv2+
 Summary:        openSUSE Build Service Commander
 Url:            http://www.gitorious.org/opensuse/osc
 Group:          Development/Tools/Other
 Source:         %{name}-%{version}.tar.gz
-Patch1:         osc-pubkey-parsing.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?mandriva_version} < 02010
 BuildRequires:  python-urlgrabber
@@ -89,7 +88,6 @@ introduction.
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 CFLAGS="%{optflags}" python setup.py build