[jboss-jad-1.2-api] New guidelines

Marek Goldmann goldmann at fedoraproject.org
Tue Jul 1 11:00:36 UTC 2014


commit 5ef9a14c9a6fc2f710feee0195a5238c20519544
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 1 13:00:37 2014 +0200

    New guidelines

 jboss-jad-1.2-api.spec |   38 +++++++++-----------------------------
 1 files changed, 9 insertions(+), 29 deletions(-)
---
diff --git a/jboss-jad-1.2-api.spec b/jboss-jad-1.2-api.spec
index 2337d9e..dec4a6c 100644
--- a/jboss-jad-1.2-api.spec
+++ b/jboss-jad-1.2-api.spec
@@ -3,7 +3,7 @@
 
 Name:          jboss-jad-1.2-api
 Version:       1.0.1
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       JavaEE Application Deployment 1.2 API
 Group:         Development/Libraries
 License:       CDDL or GPLv2 with exceptions
@@ -14,7 +14,6 @@ URL:           http://www.jboss.org
 Source0:       jboss-jad-1.2-api-%{namedversion}.tar.xz
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: jboss-common-core
 BuildRequires: jboss-logging
 BuildRequires: maven-local
@@ -30,10 +29,6 @@ BuildRequires: maven-ear-plugin
 BuildRequires: maven-eclipse-plugin
 BuildRequires: maven-ejb-plugin
 
-Requires:      jboss-common-core
-Requires:      jboss-logging
-Requires:      jpackage-utils
-
 BuildArch:     noarch
 
 %description
@@ -42,7 +37,6 @@ The JavaEE Application Deployment 1.2 API classes.
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -51,36 +45,22 @@ This package contains the API documentation for %{name}.
 %setup -q -n jboss-jad-1.2-api
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/jboss-jad-api_1.2_spec-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc README LICENSE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc README LICENSE
 
 %changelog
+* Tue Jul 01 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.1-9
+- New guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list