diff --git a/libgpg-error.changes b/libgpg-error.changes
index 77d84ab..7579402 100644
--- a/libgpg-error.changes
+++ b/libgpg-error.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
+
+- make patch0 usage consistent
+
 -------------------------------------------------------------------
 Mon Jun  1 11:41:02 CEST 2009 - puzel@suse.cz
 
diff --git a/libgpg-error.spec b/libgpg-error.spec
index 0536da5..cf5c7c0 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -21,9 +21,9 @@
 Name:           libgpg-error
 Url:            http://www.gnupg.org/
 Version:        1.7
-Release:        1
+Release:        2
 Summary:        Library That Defines Common Error Values for All GnuPG Components
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
 Source:         %name-%version.tar.bz2
@@ -45,7 +45,7 @@ Authors:
 
 %package -n libgpg-error0
 Summary:        Library That Defines Common Error Values for All GnuPG Components
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
@@ -67,7 +67,7 @@ Authors:
     Marcus Brinkmann <marcus@g10code.com>
 
 %package devel
-License:        GPL v2 or later; LGPL v2.1 or later; X11/MIT
+License:        GPL v2 or later ; LGPL v2.1 or later ; MIT License (or similar)
 Summary:        Development package for libgpg-error
 Group:          Development/Libraries/C and C++
 # bug437293
@@ -92,7 +92,7 @@ Authors:
 %prep
 %setup -q -n libgpg-error-%version
 %if %nld_build
-%patch
+%patch0
 %endif
 
 %build
@@ -131,75 +131,3 @@ rm -rf $RPM_BUILD_ROOT
 %_libdir/libgpg-error*.so
 
 %changelog
-* Mon Jun 01 2009 puzel@suse.cz
-- update to version 1.7
-  * Minor fixes and a few new error codes.
-  * Interface changes relative to the 1.6 release:
-  GPG_ERR_NOT_OPERATIONAL       NEW
-  GPG_ERR_NO_PASSPHRASE         NEW
-  GPG_ERR_NO_PIN                NEW
-* Fri Feb 20 2009 crrodriguez@suse.de
-- remove static libraries, there is no reason to use them as
-  shared libraries live in /%%{_lib}
-* Thu Jan 29 2009 olh@suse.de
-- obsolete libgpg-error-XXbit in the library subpackage
-* Wed Dec 10 2008 olh@suse.de
-- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
-  (bnc#437293)
-* Thu Oct 30 2008 olh@suse.de
-- obsolete old -XXbit packages (bnc#437293)
-* Sun May 11 2008 coolo@suse.de
-- fix rename of xxbit packages
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
-  for multilib support
-* Wed Nov 21 2007 mkoenig@suse.de
-- update to version 1.6
-  * Minor build system fixes
-  * gpg-error has a new option --version
-  * Interface changes relative to the 1.4 release:
-  GPG_ERR_UNFINISHED            NEW
-  GPG_ERR_SOURCE_GPA            NEW
-  GPG_ERR_SOURCE_KLEO           NEW
-- package branch to conform shlib policy:
-  libgpg-error0
-* Wed Dec 13 2006 mkoenig@suse.de
-- get rid of .la file and fix devel so link
-* Tue Dec 05 2006 mkoenig@suse.de
-- move shared lib to /%%_lib
-* Tue Sep 19 2006 mkoenig@suse.de
-- update to version 1.4:
-  * New error codes for the Assuan IPC library.
-  * New error code GPG_ERR_MISSING_ERRNO
-  * New error source GPG_ERR_SOURCE_ANY
-  * New convenience functions gpg_err_code_from_syserror and
-  gpg_error_from_syserror
-* Thu Jul 13 2006 mskibbe@suse.de
-- add autoreconf --force ( includes the missing -fPIC option while
-  build )
-* Wed Jul 12 2006 mskibbe@suse.de
-- update to version 1.3 which
-  o includes fixes in Makefiles
-  o fix cast problems
-  o include utf8 functions
-  o add some languages
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Thu Jun 23 2005 hvogel@suse.de
-- require libgpg-error
-- add %%clean section
-* Thu Oct 14 2004 hvogel@suse.de
-- update to version 1.0
-* Mon Sep 27 2004 hvogel@suse.de
-- fixed ac-quotation of gpg-error.m4
-* Mon Jul 19 2004 hvogel@suse.de
-- correct nld_build if statement
-* Wed Jul 14 2004 adrian@suse.de
-- create -devel subpackage
-- prepare for NLD
-* Mon May 24 2004 ro@suse.de
-- added return value to non-void function (main)
-* Wed May 19 2004 hvogel@suse.de
-- update to version 0.7
-* Tue Feb 17 2004 hvogel@suse.de
-- initial package, version 0.6