[Libvirt-cim] [PATCH] More rpm spec changes

Dan Smith danms at us.ibm.com
Tue Nov 27 13:34:34 UTC 2007


# HG changeset patch
# User Dan Smith <danms at us.ibm.com>
# Date 1196174025 28800
# Node ID 64e4f6355b52e4b7bcc984ec557610a1fa9a9786
# Parent  183df45f2bb6debe6dd9fc4aec82ad8673741107
More rpm spec changes

- Make 'rpm' target change permissions on the spec file before building
- Disable static library builds
- Make install use "install -p" to preserve file timestamps
- Include COPYING file in the base package

Signed-off-by: Dan Smith <danms at us.ibm.com>

diff -r 183df45f2bb6 -r 64e4f6355b52 Makefile.am
--- a/Makefile.am	Wed Nov 21 07:01:01 2007 -0800
+++ b/Makefile.am	Tue Nov 27 06:33:45 2007 -0800
@@ -48,5 +48,5 @@ clean-local:
 	rm -f $(BUILT_SOURCES) *~
 
 rpm: clean
-	@(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
+	@(unset CDPATH ; chmod 0644 libcmpiutil.spec ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz)
 
diff -r 183df45f2bb6 -r 64e4f6355b52 libcmpiutil.spec.in
--- a/libcmpiutil.spec.in	Wed Nov 21 07:01:01 2007 -0800
+++ b/libcmpiutil.spec.in	Tue Nov 27 06:33:45 2007 -0800
@@ -5,7 +5,7 @@ Version: @PACKAGE_VERSION@
 Version: @PACKAGE_VERSION@
 Release: 1%{?dist}%{?extra_release}
 License: LGPLv2+
-Group: Development/Libraries
+Group: System Environment/Libraries
 Source: libcmpiutil-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://libvirt.org/CIM/
@@ -40,13 +40,13 @@ chmod -x *.c *.y *.h *.l
 chmod -x *.c *.y *.h *.l
 
 %build
-%configure
+%configure --enable-static=no
 make %{?_smp_mflags}
 
 %install
 rm -fr $RPM_BUILD_ROOT
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -58,13 +58,13 @@ rm -fr $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files 
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 
-%doc doc/doxygen.conf doc/mainpage README
+%doc doc/doxygen.conf doc/mainpage README COPYING
 %{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 
 %{_libdir}/lib*.so
 %dir %{_includedir}/libcmpiutil




More information about the Libvirt-cim mailing list