summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--rubygem-rugged.spec33
-rw-r--r--sources4
3 files changed, 28 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index bbbde7c..747b493 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/rugged-0.19.0.gem
/rugged-0.21.0-test.tgz
/rugged-0.21.0.gem
+/rugged-0.22.1b1.gem
+/rugged-0.22.1b1-test.tgz
diff --git a/rubygem-rugged.spec b/rubygem-rugged.spec
index 61e9273..e536d09 100644
--- a/rubygem-rugged.spec
+++ b/rubygem-rugged.spec
@@ -1,13 +1,21 @@
%global gem_name rugged
+# Pre-release settings:
+%global pre b1
+%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}%{pre}
+%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}%{pre}.gem
+%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}%{pre}.gemspec
+%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}%{pre}
+%global gem_extdir_mri %{_libdir}/gems/ruby/%{gem_name}-%{version}%{pre}
+
Summary: Rugged is a Ruby binding to the libgit2 library
Name: rubygem-%{gem_name}
-Version: 0.21.0
-Release: 4%{?dist}
+Version: 0.22.1
+Release: 0.1.%{pre}%{?dist}
Group: Development/Languages
License: MIT
URL: http://github.com/libgit2/rugged
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{pre}.gem
# The test directory for this version is incomplete due to gemspec bug.
# Upstream has removed test and Rakefile from gem in future versions.
# https://github.com/libgit2/rugged/issues/262
@@ -15,9 +23,9 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
# This is how we are getting the tests (Source1)
# git clone git://github.com/libgit2/rugged.git
# cd rugged/
-# git checkout v0.21.0
-# tar cfz rugged-0.21.0-test.tgz test/ Rakefile
-Source1: %{gem_name}-%{version}-test.tgz
+# git checkout v0.22.1b1
+# tar cfz rugged-0.22.1b1-test.tgz test/ Rakefile
+Source1: %{gem_name}-%{version}%{pre}-test.tgz
Requires: ruby(rubygems)
Requires: ruby
BuildRequires: ruby
@@ -46,7 +54,7 @@ Documentation for %{name}
%prep
gem unpack %{SOURCE0}
-%setup -q -D -T -n %{gem_name}-%{version}
+%setup -q -D -T -n %{gem_name}-%{version}%{pre}
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
@@ -54,11 +62,15 @@ rm -rf vendor
# Remove the bundled libraries from gemspec
sed -i -e 's\, "vendor[^,]*"\\g' rugged.gemspec
+# The build system requres libgit2's version.h to be present, and defaults to
+# using the vendor'd copy. Use the system copy instead.
+sed -i -e 's|LIBGIT2_DIR = .*|LIBGIT2_DIR = "/usr"|' ext/rugged/extconf.rb
+
%build
-# Setting for rugged v0.21.0:
export CONFIGURE_ARGS="--with-cflags='%{optflags}' --use-system-libraries"
+
gem build %{gem_name}.gemspec
-%gem_install
+%gem_install -n %{gem_name}-%{version}%{pre}.gem
%install
mkdir -p %{buildroot}%{gem_dir}
@@ -99,6 +111,9 @@ popd
%doc %{gem_docdir}
%changelog
+* Tue May 05 2015 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.22.1-0.1.b1
+- Update to version 0.22.1b1 (rhbz#1166414)
+
* Fri Jan 16 2015 Vít Ondruch <vondruch@redhat.com> - 0.21.0-4
- Rebuilt for https://fedoraproject.org/wiki/Changes/Ruby_2.2
diff --git a/sources b/sources
index d8419da..60c70b6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-062ab821fdce034934e0686603ae917f rugged-0.21.0-test.tgz
-30b939de2db68f0a0476e8097d6e3eec rugged-0.21.0.gem
+7d345987caf67b906da8cb72be6aae90 rugged-0.22.1b1.gem
+74347c37502f47705b6f63bc59312f24 rugged-0.22.1b1-test.tgz