commit 94ae815794e07090b60bfccd67b2543f1c04cb04
Author: Elan Ruusamäe <[email protected]>
Date: Tue Aug 25 15:10:22 2015 +0300
fix path to pld init.d dir
fpm.spec | 2 ++
pld-init.d-dir.patch | 11 +++++++++++
2 files changed, 13 insertions(+)
---
diff --git a/fpm.spec b/fpm.spec
index 0220a1e..93a8fe8 100644
--- 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
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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fpm.git/commitdiff/94ae815794e07090b60bfccd67b2543f1c04cb04
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
