- fix path to resume binary

- remove obsolete no-rh patch

diff --git a/arch-libdir.patch b/arch-libdir.patch
new file mode 100644 (file)
index 0000000..780d48f
--- /dev/null
+++ b/arch-libdir.patch
@@ -0,0 +1,11 @@
+--- dracut-025/modules.d/95resume/module-setup.sh~     2013-01-23 15:38:48.000000000 +0100
++++ dracut-025/modules.d/95resume/module-setup.sh      2013-03-20 20:09:33.210521322 +0100
+@@ -5,7 +5,7 @@
+ install() {
+     local _bin
+     # Optional uswsusp support
+-    for _bin in /usr/sbin/resume /usr/lib/suspend/resume
++    for _bin in /usr/sbin/resume /usr/@lib@/suspend/resume
+     do
+         [[ -x "${_bin}" ]] && {
+             inst "${_bin}" /usr/sbin/resume

diff --git a/dracut.spec b/dracut.spec
index c4dd47a8b3f2b4e7b8f57247705a656436d3d097..60dfbafb2ed80f29137739e244c29f7240d25bc4 100644 (file)
--- a/dracut.spec
+++ b/dracut.spec
@@ -8,11 +8,11 @@ Group:                Base
 Source0:       http://ftp.kernel.org/pub/linux/utils/boot/dracut/%{name}-%{version}.tar.xz
 # Source0-md5: 62bb8de340afbe19756e40a846f935de
 Source1:       pld.conf
-Patch0:                no-rh.patch
-Patch1:                bash-sh.patch
-Patch2:                plymouth-libexec.patch
-Patch4:                os-release.patch
-Patch5:                plymouth-logo.patch
+Patch0:                bash-sh.patch
+Patch1:                plymouth-libexec.patch
+Patch2:                os-release.patch
+Patch3:                plymouth-logo.patch
+Patch4:                arch-libdir.patch
 URL:           https://dracut.wiki.kernel.org/
 BuildRequires: dash
 BuildRequires: docbook-dtd45-xml
@@ -172,13 +172,14 @@ konfiguracji maszyn.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/50plymouth/module-setup.sh
+%{__sed} -i -e 's,@lib@,%{_lib},g' modules.d/95resume/module-setup.sh
 find modules.d -name '*.orig' | xargs -r %{__rm}
 
 %build

diff --git a/no-rh.patch b/no-rh.patch
deleted file mode 100644 (file)
index 1e89e08..0000000
--- a/no-rh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dracut-017/modules.d/10rpmversion/module-setup.sh~ 2012-02-24 15:38:08.000000000 +0100
-+++ dracut-017/modules.d/10rpmversion/module-setup.sh  2012-03-21 14:06:18.113626194 +0100
-@@ -4,7 +4,7 @@
- 
- check() {
-     [[ "$mount_needs" ]] && return 1
--    [ -f /etc/redhat-release ]
-+    [ -x /bin/rpm ]
- }
- 
- depends() {