Skip to content

Commit

Permalink
ignore svn externals by default
Browse files Browse the repository at this point in the history
  • Loading branch information
glensc committed Aug 21, 2015
1 parent c5ec7ab commit b58b3c1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
4 changes: 3 additions & 1 deletion fpm-cookery.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
Summary: A tool for building software packages with fpm
Name: fpm-cookery
Version: 0.29.0
Release: 0.1
Release: 0.2
License: BSD
Group: Development/Languages
Source0: http://rubygems.org/downloads/%{name}-%{version}.gem
# Source0-md5: bd210d6acb6a0519f8d940200917eefe
Patch0: svn-ignore-externals.patch
URL: https://github.com/bernd/fpm-cookery
BuildRequires: rpm-rubyprov
BuildRequires: rpmbuild(macros) >= 1.656
Expand Down Expand Up @@ -37,6 +38,7 @@ A tool for building software packages with fpm.

%prep
%setup -q
%patch0 -p1
%{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*

%build
Expand Down
11 changes: 11 additions & 0 deletions svn-ignore-externals.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- ./lib/fpm/cookery/source_handler/svn.rb~ 2015-08-19 12:40:42.000000000 +0300
+++ ./lib/fpm/cookery/source_handler/svn.rb 2015-08-19 15:33:21.999812179 +0300
@@ -26,7 +26,7 @@
private
def svn(url, path)
revision = options[:revision] || 'HEAD'
- safesystem('svn', 'export', '--force', '-q', '-r', revision, url, path)
+ safesystem('svn', 'export', '--force', '--ignore-externals', '-q', '-r', revision, url, path)
end

def extracted_source

0 comments on commit b58b3c1

Please sign in to comment.