[joni] add maven pom

Mikolaj Izdebski mizdebsk at fedoraproject.org
Tue Oct 9 18:09:21 UTC 2012


commit dca38917dfe98fe47dc56af54632384fb563fb36
Author: gil <puntogil at libero.it>
Date:   Tue Oct 9 19:43:36 2012 +0200

    add maven pom

 joni.spec |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/joni.spec b/joni.spec
index 655f19c..0d8c93f 100644
--- a/joni.spec
+++ b/joni.spec
@@ -3,14 +3,13 @@
 
 Name:             joni
 Version:          1.1.3
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Java port of Oniguruma regexp library 
 Group:            Development/Libraries
 License:          MIT
 URL:              http://github.com/%{cluster}/%{name}
 Source0:          %{url}/tarball/%{version}/%{cluster}-%{name}-%{git_commit}.tar.gz
 Patch0:           add_build_lib_deps.patch
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    ant
 BuildRequires:    java-devel >= 1.5
@@ -33,8 +32,8 @@ to java. It is used by jruby.
 %setup -q -n jruby-%{name}-bb99ccb
 %patch0 -p0
 
-find ./ -name '*.jar' -exec rm -f '{}' \; 
-find ./ -name '*.class' -exec rm -f '{}' \; 
+find ./ -name '*.jar' -delete
+find ./ -name '*.class' -delete
 
 mkdir build_lib
 build-jar-repository -s -p build_lib objectweb-asm/asm jcodings
@@ -43,30 +42,31 @@ build-jar-repository -s -p build_lib objectweb-asm/asm jcodings
 ant build
 
 %install
-rm -rf %{buildroot}
 
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 target/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # fixes rpmlint warning about wrong-file-end-of-line-encoding
 sed -i -e 's|\r||' test/org/joni/test/TestC.java
 sed -i -e 's|\r||' test/org/joni/test/TestU.java
 sed -i -e 's|\r||' test/org/joni/test/TestA.java
 
-
-%clean
-rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %doc build.xml
 %doc test
 
 %changelog
+* Tue Oct 09 2012 gil cattaneo <puntogil at libero.it> - 1.1.3-8
+- add maven pom
+- adapt to current guideline
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list