[packages/fpm-cookery] don't process depends for build dependencies

glen glen at pld-linux.org
Mon Aug 31 12:58:13 CEST 2015


commit 3d136c57adda137ddab3ebd95fb410af926b95b4
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Aug 31 13:50:21 2015 +0300

    don't process depends for build dependencies
    
    in pld all -dev packages require appropriate runtime packages
    
    https://github.com/bernd/fpm-cookery/issues/123
    https://github.com/bernd/fpm-cookery/pull/116#issuecomment-136329952

 fpm-cookery.spec                   |  4 +++-
 no-runtime-deps-during-build.patch | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/fpm-cookery.spec b/fpm-cookery.spec
index 77ce461..bd09dbd 100644
--- a/fpm-cookery.spec
+++ b/fpm-cookery.spec
@@ -5,13 +5,14 @@
 Summary:	A tool for building software packages with fpm
 Name:		fpm-cookery
 Version:	0.29.0
-Release:	0.5
+Release:	0.6
 License:	BSD
 Group:		Development/Languages
 Source0:	http://rubygems.org/downloads/%{name}-%{version}.gem
 # Source0-md5:	bd210d6acb6a0519f8d940200917eefe
 Patch0:		svn-ignore-externals.patch
 Patch1:		rpm-attributes.patch
+Patch2:		no-runtime-deps-during-build.patch
 URL:		https://github.com/bernd/fpm-cookery
 BuildRequires:	rpm-rubyprov
 BuildRequires:	rpmbuild(macros) >= 1.656
@@ -42,6 +43,7 @@ A tool for building software packages with fpm.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
 
 %build
diff --git a/no-runtime-deps-during-build.patch b/no-runtime-deps-during-build.patch
new file mode 100644
index 0000000..726762d
--- /dev/null
+++ b/no-runtime-deps-during-build.patch
@@ -0,0 +1,18 @@
+https://github.com/bernd/fpm-cookery/issues/123
+
+diff --git a/lib/fpm/cookery/dependency_inspector.rb b/lib/fpm/cookery/dependency_inspector.rb
+index bd311dd..875833b 100644
+--- a/lib/fpm/cookery/dependency_inspector.rb
++++ b/lib/fpm/cookery/dependency_inspector.rb
+@@ -20,9 +20,9 @@ module FPM
+           return
+         end
+ 
+-        Log.info "Verifying build_depends and depends with Puppet"
++        Log.info "Verifying build_depends with Puppet"
+ 
+-        missing = missing_packages(build_depends + depends)
++        missing = missing_packages(build_depends)
+ 
+         if missing.length == 0
+           Log.info "All build_depends and depends packages installed"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fpm-cookery.git/commitdiff/3d136c57adda137ddab3ebd95fb410af926b95b4



More information about the pld-cvs-commit mailing list