[packages/fpm] add tmppath.patch

glen glen at pld-linux.org
Tue Aug 25 16:00:19 CEST 2015


commit 02e4017523c9ff2180ea7d0d3ef83d9762a4f611
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Aug 25 17:00:10 2015 +0300

    add tmppath.patch

 tmppath.patch | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
---
diff --git a/tmppath.patch b/tmppath.patch
new file mode 100644
index 0000000..2be83ee
--- /dev/null
+++ b/tmppath.patch
@@ -0,0 +1,14 @@
+attributes[:workdir] is empty when invoked via fpm-cookery
+just rely on os value, don't define at all
+
+--- ./lib/fpm/package/rpm.rb~	2015-08-10 23:07:09.000000000 +0300
++++ ./lib/fpm/package/rpm.rb	2015-08-21 17:11:59.163252070 +0300
+@@ -423,7 +423,7 @@
+       "--define", "_topdir #{build_path}",
+       "--define", "_sourcedir #{build_path}",
+       "--define", "_rpmdir #{build_path}/RPMS",
+-      "--define", "_tmppath #{attributes[:workdir]}"
++#      "--define", "_tmppath #{attributes[:workdir]}"
+     ]
+ 
+     args += ["--sign"] if attributes[:rpm_sign?]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fpm.git/commitdiff/02e4017523c9ff2180ea7d0d3ef83d9762a4f611



More information about the pld-cvs-commit mailing list