[opencsv/f19] adapt latest java packaging guideline

Patrick Huang pahuang at fedoraproject.org
Tue Apr 30 01:47:29 UTC 2013


commit ba1c82868c5180b3617c3c01e48c45f9d39b8c75
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Apr 29 21:47:12 2013 -0400

    adapt latest java packaging guideline

 opencsv.spec |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/opencsv.spec b/opencsv.spec
index 0d6d1d9..cdecc31 100644
--- a/opencsv.spec
+++ b/opencsv.spec
@@ -1,6 +1,6 @@
 Name:           opencsv
 Version:        2.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A very simple csv (comma-separated values) parser library for Java
 Group:          Development/Libraries
 License:        ASL 2.0
@@ -9,10 +9,6 @@ Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{version}
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  jpackage-utils
-
-BuildRequires:  java-devel
-
 BuildRequires:  maven-local
 
 BuildRequires:  maven-compiler-plugin
@@ -55,34 +51,27 @@ rm -rf lib/* doc deploy
 
 %build
 # skip test because it is not jdk 1.6 compatible 
-%global mvn_opts -Dgpg.skip=true -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true
-mvn-rpmbuild package javadoc:aggregate %mvn_opts 
-
+#%global mvn_opts -Dgpg.skip=true -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true
+#mvn-rpmbuild package javadoc:aggregate %mvn_opts 
+%mvn_build --skip-tests
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  \
-        $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%mvn_install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc examples
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files -f .mfiles-javadoc
 
 
 %changelog
+* Tue Apr 30 2013 Patrick Huang <pahuang at redhat.com> - 2.3-6
+- Adapte latest java packaging guideline
+
 * Fri Mar 1 2013 Patrick Huang <pahuang at redhat.com> - 2.3-5
 - Change to build by maven
 


More information about the scm-commits mailing list