[jcodings] Updated to version 1.0.9.

Bohuslav Kabrda bkabrda at fedoraproject.org
Fri Jan 25 09:08:35 UTC 2013


commit 61adbb8a87cc6d3fa0b97c79f87b62e88f51a312
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Fri Jan 25 10:08:28 2013 +0100

    Updated to version 1.0.9.

 .gitignore    |    1 +
 jcodings.spec |   32 ++++++++++++++++++++++----------
 sources       |    2 +-
 3 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1db711e..7a23462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 jruby-jcodings-8a3ca9e.tar.gz
 /jruby-jcodings-1.0.5-0-g3e70a1e.tar.gz
+/jruby-jcodings-1.0.9-0-gd50ee0e.tar.gz
diff --git a/jcodings.spec b/jcodings.spec
index 163661c..4997839 100644
--- a/jcodings.spec
+++ b/jcodings.spec
@@ -1,25 +1,34 @@
-%global git_commit 3e70a1e
-%global cluster jruby
+%global commit_hash d50ee0e
+%global tag_hash d50ee0e
 
 # Prevent brp-java-repack-jars from being run.
 %define __jar_repack %{nil}
 
 Name:           jcodings
-Version:        1.0.5
-Release:        4%{?dist}
+Version:        1.0.9
+Release:        1%{?dist}
 Summary:        Java-based codings helper classes for Joni and JRuby
 
 Group:          Development/Libraries
 License:        MIT
-URL:            http://github.com/%{cluster}/%{name}
-Source0:        http://download.github.com/%{cluster}-%{name}-%{version}-0-g%{git_commit}.tar.gz
+URL:            http://github.com/jruby/%{name}
+Source0:        https://github.com/jruby/jcodings/tarball/%{version}/jruby-%{name}-%{version}-0-g%{commit_hash}.tar.gz
 
 BuildArch:      noarch
 
-BuildRequires:  ant
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 
+BuildRequires:  maven
+BuildRequires:  maven-clean-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-dependency-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit4
+
 Requires:       java
 Requires:       jpackage-utils
 
@@ -28,7 +37,7 @@ Java-based codings helper classes for Joni and JRuby.
 
 
 %prep
-%setup -q -n %{cluster}-%{name}-%{git_commit}
+%setup -q -n jruby-%{name}-%{tag_hash}
 
 find -name '*.class' -delete
 find -name '*.jar' -delete
@@ -36,8 +45,7 @@ find -name '*.jar' -delete
 %build
 echo "See %{url} for more info about the %{name} project." > README.txt
 
-%{ant}
-
+mvn-rpmbuild install javadoc:aggregate
 
 %install
 mkdir -p %{buildroot}%{_javadir}
@@ -55,6 +63,10 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %doc README.txt
 
 %changelog
+* Fri Jan 25 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 1.0.9-1
+- Updated to version 1.0.9.
+- Switch to maven builds, as it seems to be preffered upstream way.
+
 * Tue Oct 09 2012 gil cattaneo <puntogil at libero.it> - 1.0.5-4
 - add maven pom
 - adapt to current guideline
diff --git a/sources b/sources
index e5efa29..ff6e30f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e53a27511fd0bd278d4152b84e71ed5e  jruby-jcodings-1.0.5-0-g3e70a1e.tar.gz
+2e8119f5bdd5d9d89283ae19b1c20ef2  jruby-jcodings-1.0.9-0-gd50ee0e.tar.gz


More information about the scm-commits mailing list