Update to sblim-sfcb-1.3.9, Compile with --enable-uds, Create sfcb system group, Fix default location where sfcbrepos is looking for schema files, Add missing soname files
This commit is contained in:
parent
63ea68a231
commit
9c0f1273e3
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
sblim-sfcb-1.3.7.tar.bz2
|
sblim-sfcb-1.3.7.tar.bz2
|
||||||
sblim-sfcb-1.3.8.tar.bz2
|
sblim-sfcb-1.3.8.tar.bz2
|
||||||
|
/sblim-sfcb-1.3.9.tar.bz2
|
||||||
|
42
sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
Normal file
42
sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
diff -up sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in
|
||||||
|
--- sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in.orig 2009-10-13 21:54:13.000000000 +0200
|
||||||
|
+++ sblim-sfcb-1.3.9/man/sfcbrepos.1.pre.in 2010-09-06 14:01:57.294564062 +0200
|
||||||
|
@@ -26,7 +26,7 @@ Supported command line options are:
|
||||||
|
.TP
|
||||||
|
\fB\-c\fR \fIschemadir\fR
|
||||||
|
Path to obtain the CIM Schema classes.
|
||||||
|
-Default is \fI@datadir@/sfcb\fR
|
||||||
|
+Default is \fI@datadir@/mof/cim-current\fR
|
||||||
|
.TP
|
||||||
|
\fB\-s\fR \fIstagingdir\fR
|
||||||
|
Path to sfcb staging area containing class MOFs and registration files
|
||||||
|
@@ -58,7 +58,7 @@ Alias of \fB-b\fR
|
||||||
|
Display usage information and exit.
|
||||||
|
.SH FILES
|
||||||
|
.TP
|
||||||
|
-\fI@datadir@/sfcb/CIM/CIM_Schema.mof\fR
|
||||||
|
+\fI@datadir@/mof/cim-current/CIM_Schema.mof\fR
|
||||||
|
CIM Schema
|
||||||
|
.TP
|
||||||
|
\fI@localstatedir@/lib/sfcb/registration/providerRegister\fR
|
||||||
|
diff -up sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig sblim-sfcb-1.3.9/sfcbrepos.sh.in
|
||||||
|
--- sblim-sfcb-1.3.9/sfcbrepos.sh.in.orig 2009-12-22 01:18:29.000000000 +0100
|
||||||
|
+++ sblim-sfcb-1.3.9/sfcbrepos.sh.in 2010-09-06 13:45:28.671491648 +0200
|
||||||
|
@@ -59,7 +59,7 @@ then
|
||||||
|
echo -e "\t-X create repository in non-native format as specifed by argument"
|
||||||
|
echo -e "\t-s specify staging directory [@localstatedir@/lib/sfcb/stage]"
|
||||||
|
echo -e "\t-r specify repository directory [@localstatedir@/lib/sfcb/registration]"
|
||||||
|
- echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/sfcb/CIM]"
|
||||||
|
+ echo -e "\t-c specify directory containing CIM Schema MOFs [@datadir@/mof/cim-current]"
|
||||||
|
echo -e "\t-t create tiny class repository by omitting inheritance information"
|
||||||
|
echo -e "\t-z compress repository with gzip"
|
||||||
|
echo
|
||||||
|
@@ -99,7 +99,7 @@ fi
|
||||||
|
|
||||||
|
if [ -z "$cimschemadir" ]
|
||||||
|
then
|
||||||
|
- cimschemadir=${DESTDIR}@datadir@/sfcb/CIM
|
||||||
|
+ cimschemadir=${DESTDIR}@datadir@/mof/cim-current
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -d $stagingdir ] && [ -f $stagingdir/default.reg ] &&
|
@ -7,7 +7,7 @@
|
|||||||
Name: sblim-sfcb
|
Name: sblim-sfcb
|
||||||
Summary: Small Footprint CIM Broker
|
Summary: Small Footprint CIM Broker
|
||||||
URL: http://www.sblim.org
|
URL: http://www.sblim.org
|
||||||
Version: 1.3.8
|
Version: 1.3.9
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: EPL
|
License: EPL
|
||||||
@ -16,6 +16,7 @@ Source0: http://downloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
|
|||||||
Patch0: %{name}-disable_auto_service_start.patch
|
Patch0: %{name}-disable_auto_service_start.patch
|
||||||
Patch1: sblim-sfcb-1.3.7-initscript.patch
|
Patch1: sblim-sfcb-1.3.7-initscript.patch
|
||||||
Patch2: sblim-sfcb-1.3.7-close_logging.patch
|
Patch2: sblim-sfcb-1.3.7-close_logging.patch
|
||||||
|
Patch3: sblim-sfcb-1.3.9-sfcbrepos-schema-location.patch
|
||||||
Provides: cim-server
|
Provides: cim-server
|
||||||
Requires: cim-schema
|
Requires: cim-schema
|
||||||
BuildRequires: libcurl-devel
|
BuildRequires: libcurl-devel
|
||||||
@ -45,9 +46,10 @@ Programming Interface (CMPI).
|
|||||||
%patch0 -p1 -b .autostart
|
%patch0 -p1 -b .autostart
|
||||||
%patch1 -p1 -b .initscript
|
%patch1 -p1 -b .initscript
|
||||||
%patch2 -p1 -b .close_logging
|
%patch2 -p1 -b .close_logging
|
||||||
|
%patch3 -p1 -b .sfcbrepos-schema-location
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-debug --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
%configure --enable-debug --enable-uds --enable-ssl --enable-pam --enable-ipv6 CFLAGS="$CFLAGS -D_GNU_SOURCE"
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
@ -60,7 +62,7 @@ mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/sfcb $RPM_BUILD_ROOT/%{_initddir}/sblim
|
|||||||
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
|
sed -i -e 's/\/var\/lock\/subsys\/sfcb/\/var\/lock\/subsys\/sblim-sfcb/g' $RPM_BUILD_ROOT/%{_initddir}/sblim-sfcb
|
||||||
# remove unused static libraries and so files
|
# remove unused static libraries and so files
|
||||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
|
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.la
|
||||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so
|
#rm -f $RPM_BUILD_ROOT/%{_libdir}/sfcb/*.so
|
||||||
|
|
||||||
echo "%defattr(-,root,root,-)" > _pkg_list
|
echo "%defattr(-,root,root,-)" > _pkg_list
|
||||||
|
|
||||||
@ -76,6 +78,7 @@ echo "%{_localstatedir}/lib/sfcb" >> _pkg_list
|
|||||||
echo "%{_bindir}/*" >> _pkg_list
|
echo "%{_bindir}/*" >> _pkg_list
|
||||||
echo "%{_sbindir}/*" >> _pkg_list
|
echo "%{_sbindir}/*" >> _pkg_list
|
||||||
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
|
echo "%{_libdir}/sfcb/*.so.*" >> _pkg_list
|
||||||
|
echo "%{_libdir}/sfcb/*.so" >> _pkg_list
|
||||||
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list
|
#echo "%{_libdir}/sfcb/*.la" >> _pkg_list
|
||||||
|
|
||||||
cat _pkg_list
|
cat _pkg_list
|
||||||
@ -83,10 +86,13 @@ cat _pkg_list
|
|||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
%pre
|
||||||
|
/usr/bin/getent group sfcb >/dev/null || /usr/sbin/groupadd -r sfcb
|
||||||
|
|
||||||
%post
|
%post
|
||||||
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || :
|
%{_datadir}/sfcb/genSslCert.sh %{_sysconfdir}/sfcb &>/dev/null || :
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
%{_bindir}/sfcbrepos -f -c /usr/share/mof/cim-current
|
%{_bindir}/sfcbrepos -f
|
||||||
/sbin/chkconfig --add sblim-sfcb
|
/sbin/chkconfig --add sblim-sfcb
|
||||||
|
|
||||||
%preun
|
%preun
|
||||||
@ -111,6 +117,16 @@ fi
|
|||||||
#%doc COPYING README
|
#%doc COPYING README
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 6 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.9-1
|
||||||
|
- Update to sblim-sfcb-1.3.9
|
||||||
|
- Compile with --enable-uds, i. e. enable unix domain socket local
|
||||||
|
connect functionality
|
||||||
|
- Create sfcb system group (used by basic authentication with PAM)
|
||||||
|
in pre install scriptlet
|
||||||
|
- Fix default location where sfcbrepos is looking for schema files
|
||||||
|
and simplify sfcbrepos command in post install sciptlet
|
||||||
|
- Add missing soname files
|
||||||
|
|
||||||
* Wed Jun 23 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.8-1
|
* Wed Jun 23 2010 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.3.8-1
|
||||||
- Update to sblim-sfcb-1.3.8
|
- Update to sblim-sfcb-1.3.8
|
||||||
- Fix unmatched calls of closeLogging() and startLogging()
|
- Fix unmatched calls of closeLogging() and startLogging()
|
||||||
|
Loading…
Reference in New Issue
Block a user