[Sblim-commit] cmpi-base Makefile.am,1.8,1.9 sblim-cmpi-base.spec.in,1.8,1.9

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

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

Modified Files:
	Makefile.am sblim-cmpi-base.spec.in 
Log Message:
RPM build makeup to address some of rpmlint's complaints.


Index: sblim-cmpi-base.spec.in
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/sblim-cmpi-base.spec.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sblim-cmpi-base.spec.in	26 Jul 2005 13:51:07 -0000	1.8
+++ sblim-cmpi-base.spec.in	27 Jul 2005 16:01:09 -0000	1.9
@@ -67,12 +67,16 @@
 
 # remove unused libtool files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
+strip $RPM_BUILD_ROOT/%{_libdir}/*.so*
 %if %{?tog_pegasus:0}%{!?tog_pegasus:1}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
+strip $RPM_BUILD_ROOT/%{_libdir}/cmpi/*.so* 
 %else
 rm -f $RPM_BUILD_ROOT/opt/tog-pegasus/providers/lib/*a
+strip $RPM_BUILD_ROOT/opt/tog-pegasus/providers/lib/*.so*
 %endif
 
+
 %post
 # Register Schema and Provider - this is higly provider specific
 
@@ -99,19 +103,21 @@
 %files
 
 %defattr(-,root,root) 
+%docdir %{_datadir}/doc/%{name}-%{version}
 %{_datadir}/%{name}
 %{_datadir}/doc/%{name}-%{version}
-%{_libdir}/*.so*
+%{_libdir}/*.so.*
 %if %{?tog_pegasus:0}%{!?tog_pegasus:1}
-%{_libdir}/cmpi/*.so*
+%{_libdir}/cmpi/*.so
 %else
-/opt/tog-pegasus/providers/lib/*.so*
+/opt/tog-pegasus/providers/lib/*.so
 %endif
 
 %files devel
 
 %defattr(-,root,root)
 %{_includedir}/*
+%{_libdir}/*.so
 
 %files test
 
@@ -119,5 +125,5 @@
 %{_datadir}/sblim-testsuite
 
 %changelog
-* Wed Jul 20 2005 Mark Hamzy <ha...@us...>	1.5.2b-1%{?tog_pegasus:.tog-pegasus}
+* Wed Jul 20 2005 Mark Hamzy <ha...@us...>	%{version}-%{release}
   - initial support

Index: Makefile.am
===================================================================
RCS file: /cvsroot/sblim/cmpi-base/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am	14 Jul 2005 14:27:47 -0000	1.8
+++ Makefile.am	27 Jul 2005 16:01:08 -0000	1.9
@@ -59,6 +59,7 @@
 		cmpiOSBase_ComputerSystem.c \
 		OSBase_ComputerSystem.c
 libcmpiOSBase_ComputerSystemProvider_la_LIBADD = -lcmpiOSBase_Common
+libcmpiOSBase_ComputerSystemProvider_la_LDFLAGS = -avoid-version
 
 # Operating System
 libcmpiOSBase_OperatingSystemProvider_la_SOURCES = \
@@ -69,7 +70,7 @@
 libcmpiOSBase_OperatingSystemProvider_la_LIBADD = -lcmpiOSBase_Common \
 						-ldmiinfo @LINDHELP@
 # This gcc/ld specific flag is ugly - need to check in configure
-libcmpiOSBase_OperatingSystemProvider_la_LDFLAGS = -Wc,-nostartfiles
+libcmpiOSBase_OperatingSystemProvider_la_LDFLAGS = -Wc,-nostartfiles -avoid-version
 
 # Operating System Statistical Data
 libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_SOURCES = \
@@ -77,6 +78,7 @@
 		cmpiOSBase_OperatingSystemStatisticalData.c \
 		OSBase_OperatingSystemStatisticalData.c
 libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_LIBADD =  -lcmpiOSBase_Common
+libcmpiOSBase_OperatingSystemStatisticalDataProvider_la_LDFLAGS = -avoid-version
 
 # Unix Process
 libcmpiOSBase_UnixProcessProvider_la_SOURCES = \
@@ -84,6 +86,7 @@
 		cmpiOSBase_UnixProcess.c \
 		OSBase_UnixProcess.c
 libcmpiOSBase_UnixProcessProvider_la_LIBADD =  -lcmpiOSBase_Common
+libcmpiOSBase_UnixProcessProvider_la_LDFLAGS =  -avoid-version
 
 # Processor 
 libcmpiOSBase_ProcessorProvider_la_SOURCES = \
@@ -91,6 +94,7 @@
 		cmpiOSBase_Processor.c \
 		OSBase_Processor.c
 libcmpiOSBase_ProcessorProvider_la_LIBADD =  -lcmpiOSBase_Common
+libcmpiOSBase_ProcessorProvider_la_LDFLAGS =  -avoid-version
 
 # Base Board
 libcmpiOSBase_BaseBoardProvider_la_SOURCES = \
@@ -98,17 +102,27 @@
 		cmpiOSBase_BaseBoard.c \
 		OSBase_BaseBoard.c
 libcmpiOSBase_BaseBoardProvider_la_LIBADD = -lcmpiOSBase_Common -ldmiinfo
+libcmpiOSBase_BaseBoardProvider_la_LDFLAGS = -avoid-version
 
 libcmpiOSBase_RunningOSProvider_la_SOURCES = cmpiOSBase_RunningOSProvider.c
 libcmpiOSBase_RunningOSProvider_la_LIBADD = -lcmpiOSBase_Common
+libcmpiOSBase_RunningOSProvider_la_LDFLAGS = -avoid-version
+
 libcmpiOSBase_OSProcessProvider_la_SOURCES = cmpiOSBase_OSProcessProvider.c
 libcmpiOSBase_OSProcessProvider_la_LIBADD = -lcmpiOSBase_Common
+libcmpiOSBase_OSProcessProvider_la_LDFLAGS = -avoid-version
+
 libcmpiOSBase_OperatingSystemStatisticsProvider_la_SOURCES = cmpiOSBase_OperatingSystemStatisticsProvider.c
 libcmpiOSBase_OperatingSystemStatisticsProvider_la_LIBADD = -lcmpiOSBase_Common
+libcmpiOSBase_OperatingSystemStatisticsProvider_la_LDFLAGS = -avoid-version
+
 libcmpiOSBase_CSProcessorProvider_la_SOURCES = cmpiOSBase_CSProcessorProvider.c
 libcmpiOSBase_CSProcessorProvider_la_LIBADD = -lcmpiOSBase_Common
+libcmpiOSBase_CSProcessorProvider_la_LDFLAGS = -avoid-version
+
 libcmpiOSBase_CSBaseBoardProvider_la_SOURCES = cmpiOSBase_CSBaseBoardProvider.c
 libcmpiOSBase_CSBaseBoardProvider_la_LIBADD = -lcmpiOSBase_Common
+libcmpiOSBase_CSBaseBoardProvider_la_LDFLAGS = -avoid-version
 
 
 # OSBase support utility libraries