From 2c246ac87f1047f7da1027e5d3b4dbbdd975868d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sun, 12 May 2013 20:02:49 +0200 Subject: [PATCH] - remove stupid sed from configure - rel 2 --- am.patch | 31 +++++++++++++++++++++++++++++++ sblim-sfcb.spec | 18 ++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 am.patch diff --git a/am.patch b/am.patch new file mode 100644 index 0000000..1dd0412 --- /dev/null +++ b/am.patch @@ -0,0 +1,31 @@ +--- sblim-sfcb-1.3.15/configure.ac~ 2012-06-15 01:44:35.000000000 +0200 ++++ sblim-sfcb-1.3.15/configure.ac 2013-05-12 19:46:38.195310655 +0200 +@@ -29,7 +29,7 @@ + #AC_DEFUN([AC_DATAROOTDIR_CHECKED]) + + AM_INIT_AUTOMAKE +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + AC_ARG_ENABLE(debug, + [AC_HELP_STRING([--disable-debug], +@@ -157,11 +157,6 @@ + + AC_DISABLE_STATIC + +-if test "$enable_debug" != "yes" ; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//'`" +- CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//'`" +-fi +- + if test "$enable_debug" == "yes"; then + SFCB_CPPFLAGS="-D SFCB_DEBUG $SFCB_CPPFLAGS" + fi +--- sblim-sfcb-1.3.15/test/TestProviders/tests/Makefile.am~ 2012-04-19 19:39:55.000000000 +0200 ++++ sblim-sfcb-1.3.15/test/TestProviders/tests/Makefile.am 2013-05-12 19:49:54.401975901 +0200 +@@ -32,4 +32,4 @@ + + #Some wbemcat tests + export SRCDIR=$(srcdir) +-TESTS = $(srcdir)/xmltest.sh $(srcdir)/IndRetryTest.sh $(srcdir)/limitTest.sh ++TESTS = xmltest.sh IndRetryTest.sh limitTest.sh diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index 50c41c4..a92827c 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -3,12 +3,13 @@ Summary: Small Footprint CIM Broker Summary(pl.UTF-8): Lekki broker CIM Name: sblim-sfcb Version: 1.3.15 -Release: 1 +Release: 2 License: Eclipse Public License v1.0 Group: Libraries Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 # Source0-md5: 117e50f989370376876163e621a59f73 Patch0: %{name}-fix.patch +Patch1: am.patch URL: http://sblim.sourceforge.net/ BuildRequires: curl-devel >= 7.11.1 BuildRequires: libstdc++-devel @@ -52,8 +53,21 @@ systemami. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +cd mofc +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__autoheader} +%{__automake} +cd .. %configure \ --disable-debug \ --enable-ipv6 \ @@ -63,7 +77,7 @@ systemami. --enable-uds # --enable-jdbc is broken (sfcSqlparse undefined) -%{__make} +%{__make} -j1 %install rm -rf $RPM_BUILD_ROOT -- 2.44.0