[jboss-jaxb-intros] New guidelines

Marek Goldmann goldmann at fedoraproject.org
Tue Jul 1 11:07:09 UTC 2014


commit a4de87874babf38a6f3e57834a6ff40481fc4483
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 1 13:07:11 2014 +0200

    New guidelines

 jboss-jaxb-intros.spec |   41 +++++++++--------------------------------
 1 files changed, 9 insertions(+), 32 deletions(-)
---
diff --git a/jboss-jaxb-intros.spec b/jboss-jaxb-intros.spec
index cdecf4b..14532ed 100644
--- a/jboss-jaxb-intros.spec
+++ b/jboss-jaxb-intros.spec
@@ -3,7 +3,7 @@
 
 Name:             jboss-jaxb-intros
 Version:          1.0.2
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          JBoss JAXB Intros
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -15,7 +15,6 @@ Source0:          %{name}-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -28,18 +27,12 @@ BuildRequires:    glassfish-jaxb-api
 BuildRequires:    glassfish-jaxb
 BuildRequires:    jvnet-parent
 
-Requires:         jpackage-utils
-Requires:         apache-commons-beanutils
-Requires:         apache-commons-logging
-Requires:         glassfish-jaxb
-
 %description
 JBoss JAXB Introductions.
 
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -48,36 +41,20 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}-%{namedversion}
 
 %build
-mvn-rpmbuild \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  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/%{name}-%{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
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jul 01 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.2-8
+- New guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list