Hello community, here is the log from the commit of package hdparm for openSUSE:Factory checked in at 2014-10-01 11:22:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hdparm (Old) and /work/SRC/openSUSE:Factory/.hdparm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hdparm" Changes: -------- --- /work/SRC/openSUSE:Factory/hdparm/hdparm.changes 2014-07-27 08:24:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hdparm.new/hdparm.changes 2014-10-01 11:22:10.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 19 05:49:02 UTC 2014 - crrodriguez@opensuse.org + +- Fix udev rules, broken script location, scriptlets + macro usages.. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hdparm.spec ++++++ --- /var/tmp/diff_new_pack.54TjZa/_old 2014-10-01 11:22:11.000000000 +0200 +++ /var/tmp/diff_new_pack.54TjZa/_new 2014-10-01 11:22:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package hdparm # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,9 @@ BuildRequires: pkgconfig(udev) Url: http://sourceforge.net/projects/hdparm/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define _udevdir %(pkg-config --variable udevdir udev) + +%{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) } +%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d } %description A shell utility to access and tune the ioctl features of the Linux IDE @@ -56,8 +58,8 @@ install -d $RPM_BUILD_ROOT/%{_sbindir} %make_install binprefix=%{_prefix} mv contrib/README contrib/README.contrib -install -d $RPM_BUILD_ROOT%{_udevdir}/rules.d -install -m 644 %{S:1} $RPM_BUILD_ROOT%{_udevdir}/rules.d +install -d $RPM_BUILD_ROOT%{_udevrulesdir} +install -m 644 %{S:1} $RPM_BUILD_ROOT%{_udevrulesdir} install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 755 %{S:3} $RPM_BUILD_ROOT/%{_udevdir}/idedma.sh @@ -99,6 +101,7 @@ && mv etc/sysconfig/ide.new etc/sysconfig/ide rm -f etc/sysconfig/ide.new fi +%{?udev_rules_update:%{udev_rules_update}} %files %defattr(-,root,root) @@ -110,10 +113,8 @@ #EndUserMerge %{_sbindir}/hdparm %{_sbindir}/wiper.sh -%dir %{_udevdir} %{_udevdir}/idedma.sh -%dir %{_udevdir}/rules.d -%{_udevdir}/rules.d/56-idedma.rules +%{_udevrulesdir}/56-idedma.rules /usr/lib/hdparm /var/adm/fillup-templates/sysconfig.ide ++++++ 56-idedma.rules ++++++ --- /var/tmp/diff_new_pack.54TjZa/_old 2014-10-01 11:22:11.000000000 +0200 +++ /var/tmp/diff_new_pack.54TjZa/_new 2014-10-01 11:22:11.000000000 +0200 @@ -1,2 +1,2 @@ # start idedma script for each added IDE device -ACTION=="add", SUBSYSTEM=="block", KERNEL=="hd*[!0-9]", RUN+="/lib/udev/idedma.sh $env{DEVNAME}" +ACTION=="add", SUBSYSTEM=="block", KERNEL=="hd*[!0-9]", RUN+="/usr/lib/udev/idedma.sh $env{DEVNAME}" ++++++ udev.idedma.sh ++++++ --- /var/tmp/diff_new_pack.54TjZa/_old 2014-10-01 11:22:11.000000000 +0200 +++ /var/tmp/diff_new_pack.54TjZa/_new 2014-10-01 11:22:11.000000000 +0200 @@ -10,7 +10,7 @@ # status is not changed. # -HDPARM=/sbin/hdparm +HDPARM=/usr/sbin/hdparm test -x $HDPARM || exit 5 # read values from sysconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org