From fcc7cb8fd2c20f06f9b01e98fb153a9feba0b11a36c9ecb23372169362004009 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 25 Sep 2014 05:47:51 +0000
Subject: [PATCH] Accepting request 250173 from
 home:elvigia:branches:Base:System

- Fix udev rules, broken script location, scriptlets
  macro usages..

OBS-URL: https://build.opensuse.org/request/show/250173
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=72
---
 56-idedma.rules |  2 +-
 hdparm.changes  |  6 ++++++
 hdparm.spec     | 15 ++++++++-------
 udev.idedma.sh  |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/56-idedma.rules b/56-idedma.rules
index 95e269e..1f803c5 100644
--- a/56-idedma.rules
+++ b/56-idedma.rules
@@ -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}"
diff --git a/hdparm.changes b/hdparm.changes
index 14e4a19..330ca19 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 19 05:49:02 UTC 2014 - crrodriguez@opensuse.org
+
+- Fix udev rules, broken script location, scriptlets 
+  macro usages..
+
 -------------------------------------------------------------------
 Sat Jul 19 13:31:06 UTC 2014 - p.drouand@gmail.com
 
diff --git a/hdparm.spec b/hdparm.spec
index acd04d5..ccfe479 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -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
 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 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
 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 @@ if [ "$NEW_DMA" != "" ] ; then
       && 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 @@ fi
 #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
 
diff --git a/udev.idedma.sh b/udev.idedma.sh
index 8274da0..8240fa8 100644
--- a/udev.idedma.sh
+++ b/udev.idedma.sh
@@ -10,7 +10,7 @@
 # status is not changed.
 #
 
-HDPARM=/sbin/hdparm
+HDPARM=/usr/sbin/hdparm
 test -x $HDPARM || exit 5
 
 # read values from sysconfig