fix path to pld init.d dir

diff --git a/fpm.spec b/fpm.spec
index 0220a1ea9e7c914bb8da5bdf8b36da20df2c9632..93a8fe80978cca75a695187e7f540ab74d54ea74 100644 (file)
--- a/fpm.spec
+++ b/fpm.spec
@@ -13,6 +13,7 @@ Source0:      http://rubygems.org/downloads/%{name}-%{version}.gem
 Patch0:                templates.patch
 Patch1:                tmppath.patch
 Patch2:                config-attrs.patch
+Patch3:                pld-init.d-dir.patch
 URL:           https://github.com/jordansissel/fpm
 BuildRequires: rpm-rubyprov
 BuildRequires: rpmbuild(macros) >= 1.665
@@ -49,6 +50,7 @@ wasting pointless hours debugging bad rpm specs!
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
 # cleanup backups after patching

diff --git a/pld-init.d-dir.patch b/pld-init.d-dir.patch
new file mode 100644 (file)
index 0000000..71b0cad
--- /dev/null
+++ b/pld-init.d-dir.patch
@@ -0,0 +1,11 @@
+--- ./lib/fpm/package/rpm.rb~  2015-08-21 17:14:34.000000000 +0300
++++ ./lib/fpm/package/rpm.rb   2015-08-25 15:09:16.819807683 +0300
+@@ -469,7 +469,7 @@
+     # add init script if present
+     (attributes[:rpm_init_list] or []).each do |init|
+       name = File.basename(init, ".init")
+-      dest_init = File.join(staging_path, "etc/init.d/#{name}")
++      dest_init = File.join(staging_path, "etc/rc.d/init.d/#{name}")
+       FileUtils.mkdir_p(File.dirname(dest_init))
+       FileUtils.cp init, dest_init
+       File.chmod(0755, dest_init)