rpms/dmraid/F-11 dmraid.spec,1.100,1.101

Heinz Mauelshagen mauelsha at fedoraproject.org
Wed Sep 16 13:15:16 UTC 2009


Author: mauelsha

Update of /cvs/pkgs/rpms/dmraid/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5337

Modified Files:
	dmraid.spec 
Log Message:
Avoid static binary


Index: dmraid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dmraid/F-11/dmraid.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- dmraid.spec	16 Sep 2009 13:03:47 -0000	1.100
+++ dmraid.spec	16 Sep 2009 13:15:16 -0000	1.101
@@ -12,7 +12,7 @@ License: GPLv2+
 Group: System Environment/Base
 URL: http://people.redhat.com/heinzm/sw/dmraid
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: device-mapper >= 1.02.02-2, device-mapper-devel, libselinux-devel, libsepol-devel
+BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel
 Requires: dmraid-events kpartx
 Requires(postun): ldconfig
 Requires(post): ldconfig
@@ -60,10 +60,6 @@ Device failure reporting has to be activ
 %patch0 -p1
 
 %build
-%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --enable-static_link --enable-led --enable-intel_led
-make DESTDIR=$RPM_BUILD_ROOT
-mv tools/dmraid tools/dmraid.static
-make clean
 %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-libselinux --enable-libsepol --disable-static_link --enable-led --enable-intel_led
 make DESTDIR=$RPM_BUILD_ROOT
 
@@ -71,9 +67,7 @@ make DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},/sbin,%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/}
 make DESTDIR=$RPM_BUILD_ROOT install
-
-# Install static dmraid binary
-install -m 755 tools/dmraid.static $RPM_BUILD_ROOT/sbin/dmraid.static
+ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static
 
 # Provide convenience link from dmevent_tool
 (cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool)




More information about the fedora-extras-commits mailing list