Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at 2012-11-06 16:12:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mdadm (Old) and /work/SRC/openSUSE:Factory/.mdadm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mdadm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2012-10-26 17:25:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mdadm.new/mdadm.changes 2012-11-06 16:12:54.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 4 01:43:34 UTC 2012 - [email protected] + +- Fix factory breakage on udev and systemd rules. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.xsAYjO/_old 2012-11-06 16:12:55.000000000 +0100 +++ /var/tmp/diff_new_pack.xsAYjO/_new 2012-11-06 16:12:55.000000000 +0100 @@ -20,7 +20,10 @@ Version: 3.2.6 Release: 0 BuildRequires: binutils-devel +BuildRequires: pkgconfig BuildRequires: sgmltool +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(systemd) PreReq: %fillup_prereq %insserv_prereq /sbin/mkinitrd Recommends: cron Recommends: smtp_daemon @@ -40,6 +43,9 @@ Source7: mdadm.cron Source8: mdadm.shutdown +%define _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d +%define _systemdshutdowndir %{_unitdir}/../system-shutdown + %description Mdadm is a program that can be used to control Linux md devices. It is intended to provide all the functionality of the mdtools and raidtools @@ -55,21 +61,22 @@ sgml2txt Software-RAID.HOWTO.sgml %install -make install DESTDIR=$RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_var}/adm/fillup-templates -install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/init.d} -install -m 755 %{S:4} %{S:3} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ -install -d $RPM_BUILD_ROOT/lib/mkinitrd/scripts -install -m 755 %{S:5} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/setup-md.sh -install -m 755 %{S:6} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/boot-md.sh -install -d $RPM_BUILD_ROOT/etc/cron.daily -install -m 755 %{S:7} $RPM_BUILD_ROOT/etc/cron.daily/mdadm -install -m 644 %{S:2} $RPM_BUILD_ROOT%{_var}/adm/fillup-templates/ -ln -sf ../../etc/init.d/mdadmd $RPM_BUILD_ROOT/%{_sbindir}/rcmdadmd -install -d $RPM_BUILD_ROOT/lib/udev/rules.d -install -m 644 udev-md-raid.rules $RPM_BUILD_ROOT/lib/udev/rules.d/64-md-raid.rules -install -d $RPM_BUILD_ROOT/lib/systemd/system-shutdown -install -m 755 %{S:8} $RPM_BUILD_ROOT/lib/systemd/system-shutdown/mdadm.shutdown +make install DESTDIR=%{buildroot} +rm -rf %{buildroot}/lib/udev +install -d %{buildroot}%{_var}/adm/fillup-templates +install -d %{buildroot}{%{_sbindir},%{_sysconfdir}/init.d} +install -m 755 %{S:4} %{S:3} %{buildroot}%{_sysconfdir}/init.d/ +install -d %{buildroot}/lib/mkinitrd/scripts +install -m 755 %{S:5} %{buildroot}/lib/mkinitrd/scripts/setup-md.sh +install -m 755 %{S:6} %{buildroot}/lib/mkinitrd/scripts/boot-md.sh +install -d %{buildroot}/etc/cron.daily +install -m 755 %{S:7} %{buildroot}/etc/cron.daily/mdadm +install -m 644 %{S:2} %{buildroot}%{_var}/adm/fillup-templates/ +ln -sf ../../etc/init.d/mdadmd %{buildroot}/%{_sbindir}/rcmdadmd +install -d %{buildroot}%{_udevrulesdir} +install -m 644 udev-md-raid.rules %{buildroot}%{_udevrulesdir}/64-md-raid.rules +install -d %{buildroot}%{_systemdshutdowndir} +install -m 755 %{S:8} %{buildroot}%{_systemdshutdowndir}/mdadm.shutdown %post [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -98,7 +105,7 @@ %stop_on_removal mdadmd %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) @@ -113,14 +120,10 @@ %dir /lib/mkinitrd/scripts /lib/mkinitrd/scripts/setup-md.sh /lib/mkinitrd/scripts/boot-md.sh -%dir /lib/udev -%dir /lib/udev/rules.d -/lib/udev/rules.d/64-md-raid.rules +%{_udevrulesdir}/64-md-raid.rules %dir /etc %dir /etc/cron.daily /etc/cron.daily/mdadm -%dir /lib/systemd -%dir /lib/systemd/system-shutdown -/lib/systemd/system-shutdown/mdadm.shutdown +%{_systemdshutdowndir}/mdadm.shutdown %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
