[openprops/f19] adapt latest java pakcage guideline

Patrick Huang pahuang at fedoraproject.org
Mon Apr 29 04:30:11 UTC 2013


commit 17a7e8fb11afacf9c7a798816af2ac9b7d782588
Author: Patrick Huang <pahuang at redhat.com>
Date:   Mon Apr 29 00:29:58 2013 -0400

    adapt latest java pakcage guideline

 openprops.spec |   31 ++++++++-----------------------
 1 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/openprops.spec b/openprops.spec
index 8674208..05b5bc7 100644
--- a/openprops.spec
+++ b/openprops.spec
@@ -1,6 +1,6 @@
 Name:           openprops
 Version:        0.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        An improved java.util.Properties from OpenJDK
 
 Group:          Development/Libraries
@@ -10,10 +10,6 @@ Source0:        https://github.com/zanata/%{name}/archive/%{name}-%{version}.zip
 
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
-
-BuildRequires:  java-devel
-
 BuildRequires:  maven-local
 
 BuildRequires:  maven-compiler-plugin
@@ -66,34 +62,23 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}-%{name}-%{version} 
  
 %build
-mvn-rpmbuild package javadoc:aggregate
+%mvn_build
 
 %install
-
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}*.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
-
-%check
-mvn-rpmbuild verify
+%mvn_install
 
 %files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc README.txt COPYING.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files -f .mfiles-javadoc
 %doc COPYING.txt
 
 
 %changelog
+* Mon Apr 29 2013 Patrick Huang <pahuang at redhat.com> 0.6-5
+- Adapt latest java packacking guideline
+
 * Tue Feb 19 2013 Patrcik Huang <pahuang at redhat.com> 0.6-4
 - Add COPYING.txt into package and update summary and simplify file section
 


More information about the scm-commits mailing list