diff --git a/dmraid.spec b/dmraid.spec index b3736ca..68b1d15 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -19,6 +19,7 @@ BuildRequires: libsepol-devel Requires: device-mapper >= 1.02.02-2 Requires: dmraid-events Requires: kpartx +Conflicts: filesystem < 3 Obsoletes: dmraid-libs < %{version}-%{release} Provides: dmraid-libs = %{version}-%{release} Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/%{name}-%{version}.tar.bz2 @@ -58,6 +59,7 @@ Summary: dmevent_tool (Device-mapper event tool) and DSO Group: System Environment/Base Requires: dmraid = %{version}-%{release}, sgpio Requires: device-mapper-event +Conflicts: filesystem < 3 %description -n dmraid-events Provides a dmeventd DSO and the dmevent_tool to register devices with it @@ -94,19 +96,17 @@ Device failure reporting has to be activated manually by activating the %patch13 -p1 %build -%define _libdir /%{_lib} - -%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 +%configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/%{_sbindir} --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 %install 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/,/var/cache/logwatch/dmeventd} +install -m 755 -d $RPM_BUILD_ROOT{%{_libdir},%{_sbindir},%{_bindir},%{_libdir},%{_includedir}/dmraid/,/var/lock/dmraid,/etc/cron.d/,/etc/logwatch/conf/services/,/etc/logwatch/scripts/services/,/var/cache/logwatch/dmeventd} make DESTDIR=$RPM_BUILD_ROOT install -ln -s dmraid $RPM_BUILD_ROOT/sbin/dmraid.static +ln -s dmraid $RPM_BUILD_ROOT/%{_sbindir}/dmraid.static # Provide convenience link from dmevent_tool -(cd $RPM_BUILD_ROOT/sbin ; ln -f dmevent_tool dm_dso_reg_tool) +(cd $RPM_BUILD_ROOT/%{_sbindir} ; ln -f dmevent_tool dm_dso_reg_tool) (cd $RPM_BUILD_ROOT/%{_mandir}/man8 ; ln -f dmevent_tool.8 dm_dso_reg_tool.8 ; ln -f dmraid.8 dmraid.static.8) install -m 644 include/dmraid/*.h $RPM_BUILD_ROOT%{_includedir}/dmraid/ @@ -140,8 +140,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc CHANGELOG CREDITS KNOWN_BUGS LICENSE LICENSE_GPL LICENSE_LGPL README TODO doc/dmraid_design.txt /%{_mandir}/man8/dmraid* -/sbin/dmraid -/sbin/dmraid.static +%{_sbindir}/dmraid +%{_sbindir}/dmraid.static %{_libdir}/libdmraid.so* %{_libdir}/libdmraid-events-isw.so* %ghost /var/lock/dmraid @@ -157,8 +157,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) /%{_mandir}/man8/dmevent_tool* /%{_mandir}/man8/dm_dso_reg_tool* -/sbin/dmevent_tool -/sbin/dm_dso_reg_tool +%{_sbindir}/dmevent_tool +%{_sbindir}/dm_dso_reg_tool # 4. Event package to support logwatch monitoring %files -n dmraid-events-logwatch