commit f2de94bfc304c89e189614ad214b26b14d02a0a4
Author: Jan Rękorajski <[email protected]>
Date: Sun Mar 13 10:21:32 2016 +0100
- fix building without git available
- rel 2
no-git.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
ruby-RMagick.spec | 4 +++-
2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/ruby-RMagick.spec b/ruby-RMagick.spec
index df2fdb1..7b0ab5b 100644
--- a/ruby-RMagick.spec
+++ b/ruby-RMagick.spec
@@ -3,13 +3,14 @@ Summary: Graphics Processing library for Ruby
Summary(pl.UTF-8): Biblioteka przetwarzania grafiki dla Ruby
Name: ruby-%{pkgname}
Version: 2.15.4
-Release: 1
+Release: 2
License: Ruby-alike
Group: Development/Languages
Source0: http://rubygems.org/downloads/rmagick-%{version}.gem
# Source0-md5: ca28bf18354103aada43bbe070c3df4d
Patch0: no-gem.patch
Patch1: disable-tests.patch
+Patch2: no-git.patch
URL: https://github.com/gemhome/rmagick
BuildRequires: ImageMagick-coder-dot
BuildRequires: ImageMagick-coder-fpx
@@ -86,6 +87,7 @@ Dokumentacji w formacie ri dla %{pkgname}.
%setup -q -n %{pkgname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__rm} spec/rmagick/draw_spec.rb
diff --git a/no-git.patch b/no-git.patch
new file mode 100644
index 0000000..37c1a6f
--- /dev/null
+++ b/no-git.patch
@@ -0,0 +1,42 @@
+--- RMagick-2.15.4/Rakefile~ 2016-03-13 10:19:00.000000000 +0100
++++ RMagick-2.15.4/Rakefile 2016-03-13 10:20:10.123489864 +0100
+@@ -21,14 +21,6 @@
+ end
+ end
+
+-desc 'abort when repo is not clean or has uncommited code'
+-task :assert_clean_repo do
+- sh('git diff --exit-code')
+- abort 'Git repo not clean' unless $CHILD_STATUS.success?
+- sh('git diff-index --quiet --cached HEAD')
+- abort 'Git repo not commited' unless $CHILD_STATUS.success?
+-end
+-
+ desc 'build gem'
+ task :build => [:config] do
+ sh 'gem build -V rmagick.gemspec'
+@@ -41,24 +33,6 @@
+ end
+ end
+
+-task :push_and_tag => [:build] do
+- sh "gem push #{File.join(base, 'pkg', gem_name)}"
+- if $CHILD_STATUS.success?
+- sh "git tag -a -m \"Version #{version}\" #{version_tag}"
+- STDOUT.puts "Tagged #{version_tag}."
+- sh 'git push'
+- sh 'git push --tags'
+- else
+- abort 'tagging aborted pushing gem failed'
+- end
+-end
+-
+-desc 'Release'
+-task :release => [:assert_clean_repo, :push_and_tag]
+-
+-desc 'Release and build the legacy way'
+-task :legacy_release=> ['legacy:README.html', 'legacy:extconf', 'legacy:doc',
'legacy:manifest', 'release']
+-
+ namespace :legacy do
+ require 'find'
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby-RMagick.git/commitdiff/f2de94bfc304c89e189614ad214b26b14d02a0a4
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
