[Sblim-commit] cmpi-base configure.ac,1.9,1.10 sblim-cmpi-base.spec.in,1.7,1.8

[Viktor M. <mih...@us...>]

Update of /cvsroot/sblim/cmpi-base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30842

Modified Files:
	configure.ac sblim-cmpi-base.spec.in 
Log Message:
Update spec file for rpmlint compliance.


Index: sblim-cmpi-base.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/sblim-cmpi-base.spec.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sblim-cmpi-base.spec.in	12 Jul 2005 13:06:55 -0000	1.7
+++ sblim-cmpi-base.spec.in	26 Jul 2005 13:51:07 -0000	1.8
@@ -11,9 +11,10 @@
 Summary: Sample CMPI Provider
 Name: @PACKAGE_TARNAME@
 Version: @PACKAGE_VERSION@
-Release: %{?tog_pegasus:tog_pegasus}%{!?tog_pegasus:1}
+Release: 1%{?tog_pegasus:.tog_pegasus}
 Group: Systems Management/Base
-License: Common Public License 1.0
+URL: http://www.sblim.org
+License: CPL
 
 Source0: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2
 
@@ -56,26 +57,21 @@
 
 %clean
 
-if [ `id -ur` != 0 ]
-then
-# paranoia check 
-	rm -rf $RPM_BUILD_ROOT 
-fi
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 %install
 
-if [ `id -ur` != 0 ]
-then
-# paranoia check 
-	rm -rf $RPM_BUILD_ROOT 
-fi
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # remove unused libtool files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
+%if %{?tog_pegasus:0}%{!?tog_pegasus:1}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
+%else
 rm -f $RPM_BUILD_ROOT/opt/tog-pegasus/providers/lib/*a
+%endif
 
 %post
 # Register Schema and Provider - this is higly provider specific
@@ -98,8 +94,7 @@
 %{_datadir}/%{name}/provider-register.sh -d %{?tog_pegasus:-t pegasus} \
 	-r %{REGISTRATION} -m %{SCHEMA} > /dev/null
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 
@@ -116,11 +111,13 @@
 %files devel
 
 %defattr(-,root,root)
-%{_includedir}
+%{_includedir}/*
 
 %files test
 
 %defattr(-,root,root)
 %{_datadir}/sblim-testsuite
 
-
+%changelog
+* Wed Jul 20 2005 Mark Hamzy <ha...@us...>	1.5.2b-1%{?tog_pegasus:.tog-pegasus}
+  - initial support

Index: configure.ac
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/configure.ac,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- configure.ac	12 Jul 2005 13:06:54 -0000	1.9
+++ configure.ac	26 Jul 2005 13:51:07 -0000	1.10
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(SBLIM BaseOS Providers Base, 1.5.2a, sbl...@li...,sblim-cmpi-base)
+AC_INIT(SBLIM BaseOS Providers Base, 1.5.2b, sbl...@li...,sblim-cmpi-base)
 AC_CONFIG_SRCDIR([OSBase_Common.c])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE