[jcodings/f20] Update for latest guidelines, rhbz #992612

mbooth mbooth at fedoraproject.org
Thu Aug 29 20:41:33 UTC 2013


commit d7f9081fa482d691b7cb33bcc4a9adf78b6b67a6
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Thu Aug 29 21:40:45 2013 +0100

    Update for latest guidelines, rhbz #992612

 jcodings.spec |   35 ++++++++---------------------------
 1 files changed, 8 insertions(+), 27 deletions(-)
---
diff --git a/jcodings.spec b/jcodings.spec
index 3292546..c88e6b4 100644
--- a/jcodings.spec
+++ b/jcodings.spec
@@ -6,7 +6,7 @@
 
 Name:           jcodings
 Version:        1.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java-based codings helper classes for Joni and JRuby
 
 Group:          Development/Libraries
@@ -16,21 +16,7 @@ Source0:        https://github.com/jruby/jcodings/tarball/%{version}/jruby-%{nam
 
 BuildArch:      noarch
 
-BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
-
 BuildRequires:  maven-local
-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
 
 %description
 Java-based codings helper classes for Joni and JRuby.
@@ -45,24 +31,19 @@ find -name '*.jar' -delete
 %build
 echo "See %{url} for more info about the %{name} project." > README.txt
 
-mvn-rpmbuild install javadoc:aggregate
+%pom_xpath_remove "pom:build/pom:extensions"
+%mvn_build
 
 %install
-mkdir -p %{buildroot}%{_javadir}
-
-cp -p target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
 %doc README.txt
 
 %changelog
+* Thu Aug 29 2013 Mat Booth <fedora at matbooth.co.uk> - 1.0.9-4
+- Update for latest guidelines, rhbz #992612
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list