From d705cf8580b04daeea070f620039a70147e40c0bdc61c76c3df6f7c1e2e76c40 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 19 May 2010 22:04:22 +0000 Subject: [PATCH 1/3] Accepting request 40393 from home:RedDwarf:branches:KDE:Qt Copy from home:RedDwarf:branches:KDE:Qt/python-sip via accept of submit request 40393 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/40393 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=37 --- build-compare.diff | 16 ++++++++++++++++ python-sip.changes | 5 +++++ python-sip.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 build-compare.diff diff --git a/build-compare.diff b/build-compare.diff new file mode 100644 index 0000000..925fa55 --- /dev/null +++ b/build-compare.diff @@ -0,0 +1,16 @@ +Index: sipgen/gencode.c +=================================================================== +--- sipgen/gencode.c.orig ++++ sipgen/gencode.c +@@ -12687,9 +12687,9 @@ static FILE *createFile(moduleDef *mod, + "/*\n" + " * %s\n" + " *\n" +-" * Generated by SIP %s on %s" ++" * Generated by SIP %s" + ,description +- ,sipVersion,ctime(&now)); ++ ,sipVersion); + + if (mod->copying != NULL) + prcode(fp, diff --git a/python-sip.changes b/python-sip.changes index 1ee9c4b..ec16a53 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 19 19:49:19 UTC 2010 - cmorve69@yahoo.es + +- fix build-compare + ------------------------------------------------------------------- Fri Mar 26 18:49:41 CET 2010 - dmueller@suse.de diff --git a/python-sip.spec b/python-sip.spec index 89aa91f..b61e98f 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -32,6 +32,7 @@ Source0: sip-%{rversion}.tar.bz2 Patch0: disable-rpaths.diff Patch2: fix-linking.diff Patch3: fix-linking25.diff +Patch4: build-compare.diff %py_requires %description @@ -78,6 +79,7 @@ Authors: %else %patch3 %endif +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" From 04f6e552b5e0980a216c0c9885615ae546ec7fc8b7d0e1a3361ad683c5828dc3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 25 May 2010 12:08:25 +0000 Subject: [PATCH 2/3] checked in (request 40407) OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=38 --- build-compare.diff | 16 ---------------- python-sip.changes | 5 ----- python-sip.spec | 2 -- 3 files changed, 23 deletions(-) delete mode 100644 build-compare.diff diff --git a/build-compare.diff b/build-compare.diff deleted file mode 100644 index 925fa55..0000000 --- a/build-compare.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: sipgen/gencode.c -=================================================================== ---- sipgen/gencode.c.orig -+++ sipgen/gencode.c -@@ -12687,9 +12687,9 @@ static FILE *createFile(moduleDef *mod, - "/*\n" - " * %s\n" - " *\n" --" * Generated by SIP %s on %s" -+" * Generated by SIP %s" - ,description -- ,sipVersion,ctime(&now)); -+ ,sipVersion); - - if (mod->copying != NULL) - prcode(fp, diff --git a/python-sip.changes b/python-sip.changes index ec16a53..1ee9c4b 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed May 19 19:49:19 UTC 2010 - cmorve69@yahoo.es - -- fix build-compare - ------------------------------------------------------------------- Fri Mar 26 18:49:41 CET 2010 - dmueller@suse.de diff --git a/python-sip.spec b/python-sip.spec index b61e98f..89aa91f 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -32,7 +32,6 @@ Source0: sip-%{rversion}.tar.bz2 Patch0: disable-rpaths.diff Patch2: fix-linking.diff Patch3: fix-linking25.diff -Patch4: build-compare.diff %py_requires %description @@ -79,7 +78,6 @@ Authors: %else %patch3 %endif -%patch4 %build export CFLAGS="$RPM_OPT_FLAGS" From 416c3edb91ebca83416f3529b53b2e0f9ba270c10801de68a75c8de82e3bda54 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 25 May 2010 12:08:26 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/python-sip revision 30.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt/python-sip?expand=0&rev=e8c9e2a962e7c5cc6353b4c1f6f3222b --- build-compare.diff | 16 ++++++++++++++++ python-sip.changes | 5 +++++ python-sip.spec | 4 +++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 build-compare.diff diff --git a/build-compare.diff b/build-compare.diff new file mode 100644 index 0000000..925fa55 --- /dev/null +++ b/build-compare.diff @@ -0,0 +1,16 @@ +Index: sipgen/gencode.c +=================================================================== +--- sipgen/gencode.c.orig ++++ sipgen/gencode.c +@@ -12687,9 +12687,9 @@ static FILE *createFile(moduleDef *mod, + "/*\n" + " * %s\n" + " *\n" +-" * Generated by SIP %s on %s" ++" * Generated by SIP %s" + ,description +- ,sipVersion,ctime(&now)); ++ ,sipVersion); + + if (mod->copying != NULL) + prcode(fp, diff --git a/python-sip.changes b/python-sip.changes index 1ee9c4b..ec16a53 100644 --- a/python-sip.changes +++ b/python-sip.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 19 19:49:19 UTC 2010 - cmorve69@yahoo.es + +- fix build-compare + ------------------------------------------------------------------- Fri Mar 26 18:49:41 CET 2010 - dmueller@suse.de diff --git a/python-sip.spec b/python-sip.spec index 89aa91f..c66f627 100644 --- a/python-sip.spec +++ b/python-sip.spec @@ -24,7 +24,7 @@ License: GPLv2+ Group: Development/Libraries/Python Summary: SIP tool to use python sip bindings Version: 4.10.1 -Release: 1 +Release: 2 %define rversion %version Url: http://www.riverbankcomputing.com/software/sip/intro BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -32,6 +32,7 @@ Source0: sip-%{rversion}.tar.bz2 Patch0: disable-rpaths.diff Patch2: fix-linking.diff Patch3: fix-linking25.diff +Patch4: build-compare.diff %py_requires %description @@ -78,6 +79,7 @@ Authors: %else %patch3 %endif +%patch4 %build export CFLAGS="$RPM_OPT_FLAGS"