[PATCH] More rpm changes, per Fedora package review process
# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1195572986 28800 # Node ID 820db60ea59d76e6fc2080ba3f2851415191fc76 # Parent f2c751be5069df9eb23a8bdbaafd5d55b3fd24e9 More rpm changes, per Fedora package review process Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r f2c751be5069 -r 820db60ea59d libcmpiutil.spec.in --- a/libcmpiutil.spec.in Mon Nov 19 12:57:42 2007 -0800 +++ b/libcmpiutil.spec.in Tue Nov 20 07:36:26 2007 -0800 @@ -4,7 +4,7 @@ Name: libcmpiutil Name: libcmpiutil Version: @PACKAGE_VERSION@ Release: 1%{?dist}%{?extra_release} -License: LGPL +License: LGPLv2+ Group: Development/Libraries Source: libcmpiutil-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -26,6 +26,7 @@ Group: Development/Libraries Group: Development/Libraries Requires: tog-pegasus-devel Requires: pkgconfig +Requires: %{name} = %{version}-%{release} %description devel Includes and documentations for the CMPI utility library @@ -36,42 +37,41 @@ instance properties to standardizing met %prep %setup -q +chmod -x *.c *.y *.h *.l %build %configure -make +make %{?_smp_mflags} %install -rm -fr %{buildroot} +rm -fr $RPM_BUILD_ROOT -%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean -rm -fr %{buildroot} +rm -fr $RPM_BUILD_ROOT -%post -/sbin/ldconfig +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig +%postun -p /sbin/ldconfig %files %defattr(-, root, root) -%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches README +%doc doc/doxygen.conf doc/mainpage README %{_libdir}/lib*.so.* %files devel %defattr(-, root, root) %{_libdir}/lib*.so -%dir %{_includedir}/ +%dir %{_includedir}/libcmpiutil %{_includedir}/libcmpiutil/*.h %{_libdir}/pkgconfig/libcmpiutil.pc -%doc doc/doxygen.conf doc/mainpage doc/SubmittingPatches README +%doc doc/SubmittingPatches %changelog * Fri Oct 26 2007 Daniel Veillard <veillard@redhat.com> - 0.1-1
On Tue, Nov 20, 2007 at 07:36:29AM -0700, Dan Smith wrote: [...]
-%makeinstall +make DESTDIR=$RPM_BUILD_ROOT install
Hum, what led to this change ? This is 2 completely different ways to rebase the installation paths, and we use %makeinstall in Red Hat packages usually. Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard@redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
DV> Hum, what led to this change ? This is 2 completely different ways DV> to rebase the installation paths, and we use %makeinstall in Red DV> Hat packages usually. Fedora packaging guidelines :) http://fedoraproject.org/wiki/Packaging/Guidelines#head-fcaf3e6fcbd51194a5d0... -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
On Tue, Nov 20, 2007 at 01:35:56PM -0800, Dan Smith wrote:
DV> Hum, what led to this change ? This is 2 completely different ways DV> to rebase the installation paths, and we use %makeinstall in Red DV> Hat packages usually.
Fedora packaging guidelines :)
http://fedoraproject.org/wiki/Packaging/Guidelines#head-fcaf3e6fcbd51194a5d0...
Hum, okay, if you're 100% sure DESTDIR doesn't break, fine :-) Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard@redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/
DV> Hum, okay, if you're 100% sure DESTDIR doesn't break, fine :-) I'm not 100% sure of anything :) It seems to work fine for me, but I'll take a closer look to make sure it's doing what it's supposed to. -- Dan Smith IBM Linux Technology Center Open Hypervisor Team email: danms@us.ibm.com
participants (2)
-
Dan Smith -
Daniel Veillard