commit 7d30e5febe64dc0a282883a91a37f893c51bf775
Author: Jakub Bogusz <[email protected]>
Date: Fri Jan 9 22:21:32 2015 +0100
- updated to 1.4.9
- updated am patch
- old fix patch obsolete, replaced by one with another build fix
am.patch | 8 --------
sblim-sfcb-fix.patch | 38 ++++++++++++++++----------------------
sblim-sfcb.spec | 30 +++++++++++++++++++-----------
3 files changed, 35 insertions(+), 41 deletions(-)
---
diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec
index a92827c..095af04 100644
--- a/sblim-sfcb.spec
+++ b/sblim-sfcb.spec
@@ -2,12 +2,12 @@
Summary: Small Footprint CIM Broker
Summary(pl.UTF-8): Lekki broker CIM
Name: sblim-sfcb
-Version: 1.3.15
-Release: 2
+Version: 1.4.9
+Release: 1
License: Eclipse Public License v1.0
Group: Libraries
Source0:
http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
-# Source0-md5: 117e50f989370376876163e621a59f73
+# Source0-md5: 28021cdabc73690a94f4f9d57254ce30
Patch0: %{name}-fix.patch
Patch1: am.patch
URL: http://sblim.sourceforge.net/
@@ -16,14 +16,20 @@ BuildRequires: libstdc++-devel
BuildRequires: openslp-devel
BuildRequires: openssl-devel >= 0.9.7
BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.644
+BuildRequires: sblim-cmpi-devel
+BuildRequires: sblim-sfcCommon-devel >= 1.0.1
+BuildRequires: unzip
+BuildRequires: zlib-devel
Requires(post): openssl-tools
+Requires: sblim-sfcCommon >= 1.0.1
Provides: cimserver
Suggests: sblim-sfcb-schema
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# undefined newList in libsfcUtil: circular dependencies with libsfcBrokerCore
-# undefined trimws in libsfcCimXmlCodec: symbols expected to be defined in
binary
-%define skip_post_check_so libsfcUtil\.so.*
libsfcCimXmlCodec\.so.*
+# libsfcCimXmlCodec needs trimws symbol exported from broker binary
+# libsfcHttpAdapter needs fallback_ipv4 symbol exported from broker binary
+%define skip_post_check_so libsfcCimXmlCodec\.so.*
libsfcHttpAdapter\.so.*
%description
sfcb is a lightweight CIM daemon (aka CIMOM) that responds to CIM
@@ -69,28 +75,31 @@ cd mofc
%{__automake}
cd ..
%configure \
+ SYSTEMDDIR=%{systemdunitdir} \
--disable-debug \
- --enable-ipv6 \
--enable-pam \
--enable-slp \
--enable-ssl \
--enable-uds
-# --enable-jdbc is broken (sfcSqlparse undefined)
%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{systemdunitdir}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
initdir=/etc/rc.d/init.d
# libraries with no headers installed
-%{__rm}
$RPM_BUILD_ROOT%{_libdir}/sfcb/libsfc{BrokerCore,CimXmlCodec,FileRepository,HttpAdapter,InternalProvider,Util}.so
+%{__rm}
$RPM_BUILD_ROOT%{_libdir}/sfcb/libsfc{BrokerCore,CimXmlCodec,FileRepository,HttpAdapter,InternalProvider}.so
# the same or dlopened modules
%{__rm} $RPM_BUILD_ROOT%{_libdir}/sfcb/*.la
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/sfcb-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -110,6 +119,7 @@ fi
%attr(755,root,root) %{_bindir}/wbemcat
%attr(755,root,root) %{_bindir}/xmltest
%attr(755,root,root) %{_sbindir}/sfcbd
+%{systemdunitdir}/sblim-sfcb.service
%dir %{_libdir}/sfcb
# libs
%attr(755,root,root) %{_libdir}/sfcb/libsfcBrokerCore.so.*.*.*
@@ -122,8 +132,6 @@ fi
%attr(755,root,root) %{_libdir}/sfcb/libsfcHttpAdapter.so.0
%attr(755,root,root) %{_libdir}/sfcb/libsfcInternalProvider.so.*.*.*
%attr(755,root,root) %{_libdir}/sfcb/libsfcInternalProvider.so.0
-%attr(755,root,root) %{_libdir}/sfcb/libsfcUtil.so.*.*.*
-%attr(755,root,root) %{_libdir}/sfcb/libsfcUtil.so.0
# providers dlopened by libsfcBrokerCore
%attr(755,root,root) %{_libdir}/sfcb/libsfcBasicAuthentication.so*
%attr(755,root,root) %{_libdir}/sfcb/libsfcBasicPAMAuthentication.so*
diff --git a/am.patch b/am.patch
index 1dd0412..61acc64 100644
--- a/am.patch
+++ b/am.patch
@@ -21,11 +21,3 @@
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-fix.patch b/sblim-sfcb-fix.patch
index 1000ef0..de32808 100644
--- a/sblim-sfcb-fix.patch
+++ b/sblim-sfcb-fix.patch
@@ -1,22 +1,16 @@
---- sblim-sfcb-1.3.15/sqlStatement.h.orig 2010-04-14 00:56:07.000000000
+0200
-+++ sblim-sfcb-1.3.15/sqlStatement.h 2012-07-02 17:36:01.243897252 +0200
-@@ -344,7 +344,7 @@
- UpdIns* newUpdIns(const char* tname, UtilList* colList,UtilList*
assignmentList,UtilList* where);
- Insert* newInsert(const char* tname);
- ClassDef* newClassDef(int fieldCount, const char * className, UtilList *
fieldNameList, int fNameLength, const char * superclass);
--Call* newCall(char * tname, char * pname, UtilList * klist, UtilList * pList);
-+Call* newCall(const char * tname, const char * pname, UtilList * klist,
UtilList * pList);
-
-
-
---- sblim-sfcb-1.3.15/sqlStatement.c.orig 2011-12-01 00:24:18.000000000
+0100
-+++ sblim-sfcb-1.3.15/sqlStatement.c 2012-07-02 17:39:30.290555146 +0200
-@@ -1729,7 +1729,7 @@
- sl = d.value.sint64;
- break;
- default:
-- ul = 0;
-+ sl = 0;
- break;
- }
- sprintf(sp,"%lld", sl);
+--- sblim-sfcb-1.4.9/trace.h.orig 2014-11-25 02:43:17.000000000 +0100
++++ sblim-sfcb-1.4.9/trace.h 2015-01-09 18:27:47.226287411 +0100
+@@ -94,11 +94,12 @@
+ #else
+ #define _SFCB_TRACE_FUNCTION(n,f)
+ #define _SFCB_TRACE_VAR(f)
++#define _SFCB_TRACE_VAR_PTR(v,f)
+ #define _SFCB_TRACE(LEVEL,STR)
+ #define _SFCB_ENTER(n,f)
+ #define _SFCB_EXIT() { return; }
+ #define _SFCB_RETURN(v) {\
+- return (v); }
++ return v; }
+ #define _SFCB_ABORT() {\
+ printf("--- %s(%d) Abrted\n",__FILE__,__LINE__); \
+ abort(); }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sblim-sfcb.git/commitdiff/7d30e5febe64dc0a282883a91a37f893c51bf775
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
