diff --git a/sblim-sfcb-1.3.16-multilib-man-cfg.patch b/sblim-sfcb-1.3.16-multilib-man-cfg.patch new file mode 100644 index 0000000..c8cece2 --- /dev/null +++ b/sblim-sfcb-1.3.16-multilib-man-cfg.patch @@ -0,0 +1,41 @@ +diff -up sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig sblim-sfcb-1.3.16/man/sfcbd.1.pre.in +--- sblim-sfcb-1.3.16/man/sfcbd.1.pre.in.orig 2014-02-26 14:05:32.213091734 +0100 ++++ sblim-sfcb-1.3.16/man/sfcbd.1.pre.in 2014-02-26 15:10:54.476196379 +0100 +@@ -151,7 +151,7 @@ Default=\fI@localstatedir@/lib/sfcb/regi + .TP + .B providerDirs + A space separated list of directories where sfcb is looking for provider +-libraries. Default=\fI@libdir@\ @libdir@/cmpi\fR ++libraries. Default=\fI/usr/lib\ /usr/lib/cmpi /usr/lib64\ /usr/lib64/cmpi\fR + .TP + .B providerSampleInterval + The interval in seconds at which the provider manager is checking for +@@ -275,11 +275,11 @@ SSL private key file for sfcb. + SSL client certificate / trust store for sfcb. + .SH LIBRARIES + .TP +-.I @libdir@/libsfc* ++.I /usr/lib/libsfc* /usr/lib64/libsfc* + Binaries for sfcb runtime libraries. + .TP +-.I @libdir@/cmpi/* +-Binaries for providers ++.I /usr/lib/cmpi/* /usr/lib64/cmpi/* ++Binaries for providers. + .SH AUTHOR + Adrian Schuur + .SH CONRIBUTORS +diff -up sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig sblim-sfcb-1.3.16/sfcb.cfg.pre.in +--- sblim-sfcb-1.3.16/sfcb.cfg.pre.in.orig 2014-02-26 15:35:43.133869718 +0100 ++++ sblim-sfcb-1.3.16/sfcb.cfg.pre.in 2014-02-26 15:38:12.794240532 +0100 +@@ -121,8 +121,8 @@ maxMsgLen: 100000000 + registrationDir: @localstatedir@/lib/sfcb/registration + + ## Locations to look for provider libraries. Delimit paths with a space. +-## Default is @libdir@/sfcb @libdir@ @libdir@/cmpi +-providerDirs: @libdir@/sfcb @libdir@ @libdir@/cmpi ++## Default is /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi ++providerDirs: /usr/lib/sfcb /usr/lib64/sfcb /usr/lib /usr/lib64 /usr/lib/cmpi /usr/lib64/cmpi + + ## Enable the root/interop namespace (affects indications) + ## Default: true diff --git a/sblim-sfcb.spec b/sblim-sfcb.spec index f908fae..0e9f2be 100644 --- a/sblim-sfcb.spec +++ b/sblim-sfcb.spec @@ -8,7 +8,7 @@ Name: sblim-sfcb Summary: Small Footprint CIM Broker URL: http://sblim.wiki.sourceforge.net/ Version: 1.4.7 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/System License: EPL Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 @@ -26,6 +26,8 @@ Patch1: sblim-sfcb-1.3.15-fix-provider-debugging.patch Patch2: sblim-sfcb-1.3.16-maxMsgLen.patch # Patch3: we'll install own service file Patch3: sblim-sfcb-1.4.5-service.patch +# Patch4: fixes multilib issue with man page and config file +Patch4: sblim-sfcb-1.3.16-multilib-man-cfg.patch Provides: cim-server = 0 Requires: cim-schema Requires: sblim-sfcCommon @@ -57,6 +59,7 @@ Programming Interface (CMPI). %patch1 -p1 -b .fix-provider-debugging %patch2 -p1 -b .maxMsgLen %patch3 -p1 -b .service +%patch4 -p1 -b .multilib-man-cfg %build %configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 \ @@ -116,6 +119,9 @@ fi; %files -f _pkg_list %changelog +* Mon Mar 24 2014 Vitezslav Crhonek - 1.4.7-3 +- Fix multilib issue with man page and config file + * Tue Jan 21 2014 Vitezslav Crhonek - 1.4.7-2 - Add few configure options, build require openslp-devel