From 9012284e10778e377c223f1f3af531388b9a399c9773c5f8809ed4ecec9c3c4d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 21 Dec 2009 18:27:20 +0000 Subject: [PATCH 1/3] - do not patch arch specific Makefiles, but simply pass WARN_FLAGS OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=8 --- Botan-use_rpm_opt_flags.patch | 13 ------------- Botan.changes | 5 +++++ Botan.spec | 4 +--- 3 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 Botan-use_rpm_opt_flags.patch diff --git a/Botan-use_rpm_opt_flags.patch b/Botan-use_rpm_opt_flags.patch deleted file mode 100644 index d4ca641..0000000 --- a/Botan-use_rpm_opt_flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile.orig 2009-11-27 15:09:06.000000000 +0100 -+++ Makefile 2009-11-27 16:14:16.117516962 +0100 -@@ -5,7 +5,7 @@ CXX = g++ -m64 - LIB_OPT = -O2 -finline-functions - CHECK_OPT = -O2 - MACH_OPT = --LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long -+LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long $(RPM_OPT_FLAGS) - WARN_FLAGS = -W -Wall - SO_OBJ_FLAGS = -fPIC - SO_LINK_CMD = $(CXX) -shared -fPIC -Wl,-soname,$(SONAME) diff --git a/Botan.changes b/Botan.changes index 65b25e8..2fbedb8 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 21 17:34:49 UTC 2009 - coolo@novell.com + +- do not patch arch specific Makefiles, but simply pass WARN_FLAGS + ------------------------------------------------------------------- Mon Dec 21 00:32:43 CET 2009 - ro@suse.de diff --git a/Botan.spec b/Botan.spec index dbe0311..7b1f1c0 100644 --- a/Botan.spec +++ b/Botan.spec @@ -29,7 +29,6 @@ AutoReqProv: on Prefix: /usr Group: Development/Libraries/C and C++ Source: %{name}-%{version}.tar.bz2 -Source1: Botan-use_rpm_opt_flags.patch Patch0: Botan-inttypes.patch Patch1: Botan-ull_constants.patch.bz2 Patch2: Botan-fix_install_paths.patch @@ -105,8 +104,7 @@ export RPM_OPT_FLAGS --with-gnump \ --with-openssl \ --with-tr1-implementation=system -patch -p0 -i %{S:1} -make %{?_smp_mflags} +make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS" %install %makeinstall From c52f72db834167c1f2ab457dc31a91eb7cb44bc1b44819db74e6789f4b91bedf Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 21 Dec 2009 22:35:44 +0000 Subject: [PATCH 2/3] checked in OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=9 --- Botan-use_rpm_opt_flags.patch | 13 +++++++++++++ Botan.changes | 5 ----- Botan.spec | 4 +++- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 Botan-use_rpm_opt_flags.patch diff --git a/Botan-use_rpm_opt_flags.patch b/Botan-use_rpm_opt_flags.patch new file mode 100644 index 0000000..d4ca641 --- /dev/null +++ b/Botan-use_rpm_opt_flags.patch @@ -0,0 +1,13 @@ +Index: Makefile +=================================================================== +--- Makefile.orig 2009-11-27 15:09:06.000000000 +0100 ++++ Makefile 2009-11-27 16:14:16.117516962 +0100 +@@ -5,7 +5,7 @@ CXX = g++ -m64 + LIB_OPT = -O2 -finline-functions + CHECK_OPT = -O2 + MACH_OPT = +-LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long ++LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long $(RPM_OPT_FLAGS) + WARN_FLAGS = -W -Wall + SO_OBJ_FLAGS = -fPIC + SO_LINK_CMD = $(CXX) -shared -fPIC -Wl,-soname,$(SONAME) diff --git a/Botan.changes b/Botan.changes index 2fbedb8..65b25e8 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Dec 21 17:34:49 UTC 2009 - coolo@novell.com - -- do not patch arch specific Makefiles, but simply pass WARN_FLAGS - ------------------------------------------------------------------- Mon Dec 21 00:32:43 CET 2009 - ro@suse.de diff --git a/Botan.spec b/Botan.spec index 7b1f1c0..dbe0311 100644 --- a/Botan.spec +++ b/Botan.spec @@ -29,6 +29,7 @@ AutoReqProv: on Prefix: /usr Group: Development/Libraries/C and C++ Source: %{name}-%{version}.tar.bz2 +Source1: Botan-use_rpm_opt_flags.patch Patch0: Botan-inttypes.patch Patch1: Botan-ull_constants.patch.bz2 Patch2: Botan-fix_install_paths.patch @@ -104,7 +105,8 @@ export RPM_OPT_FLAGS --with-gnump \ --with-openssl \ --with-tr1-implementation=system -make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS" +patch -p0 -i %{S:1} +make %{?_smp_mflags} %install %makeinstall From 19fc59a8d42cc8c7e53b16c52c9a2d7f51431bb9242ea8ac9f5c2a60fc1fdfe1 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 21 Dec 2009 22:35:45 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/Botan revision 7.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/Botan?expand=0&rev=67878206045ab00763c37bcca10436cb --- Botan-use_rpm_opt_flags.patch | 13 ------------- Botan.changes | 5 +++++ Botan.spec | 6 ++---- 3 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 Botan-use_rpm_opt_flags.patch diff --git a/Botan-use_rpm_opt_flags.patch b/Botan-use_rpm_opt_flags.patch deleted file mode 100644 index d4ca641..0000000 --- a/Botan-use_rpm_opt_flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- Makefile.orig 2009-11-27 15:09:06.000000000 +0100 -+++ Makefile 2009-11-27 16:14:16.117516962 +0100 -@@ -5,7 +5,7 @@ CXX = g++ -m64 - LIB_OPT = -O2 -finline-functions - CHECK_OPT = -O2 - MACH_OPT = --LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long -+LANG_FLAGS = -D_REENTRANT -ansi -Wno-long-long $(RPM_OPT_FLAGS) - WARN_FLAGS = -W -Wall - SO_OBJ_FLAGS = -fPIC - SO_LINK_CMD = $(CXX) -shared -fPIC -Wl,-soname,$(SONAME) diff --git a/Botan.changes b/Botan.changes index 65b25e8..2fbedb8 100644 --- a/Botan.changes +++ b/Botan.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 21 17:34:49 UTC 2009 - coolo@novell.com + +- do not patch arch specific Makefiles, but simply pass WARN_FLAGS + ------------------------------------------------------------------- Mon Dec 21 00:32:43 CET 2009 - ro@suse.de diff --git a/Botan.spec b/Botan.spec index dbe0311..7f75adf 100644 --- a/Botan.spec +++ b/Botan.spec @@ -21,7 +21,7 @@ Name: Botan Version: 1.8.8 -Release: 2 +Release: 3 Url: http://botan.randombit.net Summary: A C++ Crypto Library License: BSD3c @@ -29,7 +29,6 @@ AutoReqProv: on Prefix: /usr Group: Development/Libraries/C and C++ Source: %{name}-%{version}.tar.bz2 -Source1: Botan-use_rpm_opt_flags.patch Patch0: Botan-inttypes.patch Patch1: Botan-ull_constants.patch.bz2 Patch2: Botan-fix_install_paths.patch @@ -105,8 +104,7 @@ export RPM_OPT_FLAGS --with-gnump \ --with-openssl \ --with-tr1-implementation=system -patch -p0 -i %{S:1} -make %{?_smp_mflags} +make %{?_smp_mflags} WARN_FLAGS="$RPM_OPT_FLAGS" %install %makeinstall