From 7371d2ce07f486924896cf8cdaa72b67be82054d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: May 29 2014 10:32:04 +0000 Subject: Update to current packaging guidelines --- diff --git a/maven-injection-plugin.spec b/maven-injection-plugin.spec index 7018720..d4b3fe8 100644 --- a/maven-injection-plugin.spec +++ b/maven-injection-plugin.spec @@ -1,47 +1,28 @@ -Name: maven-injection-plugin -Version: 1.0.2 -Release: 10%{?dist} -Summary: Bytecode injection at Maven build time -Group: Development/Libraries -License: LGPLv2+ -URL: http://www.jboss.org +Name: maven-injection-plugin +Version: 1.0.2 +Release: 11%{?dist} +Summary: Bytecode injection at Maven build time +License: LGPLv2+ +URL: http://www.jboss.org +BuildArch: noarch # svn export http://anonsvn.jboss.org/repos/labs/labs/jbossbuild/maven-plugins/tags/maven-injection-plugin-1.0.2/ # tar cafJ maven-injection-plugin-1.0.2.tar.xz maven-injection-plugin-1.0.2 -Source0: %{name}-%{version}.tar.xz - -BuildArch: noarch - -BuildRequires: jpackage-utils -BuildRequires: java-devel -BuildRequires: maven-local - -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-release-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: javassist -BuildRequires: jboss-parent -BuildRequires: junit -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-plugin-cobertura -BuildRequires: maven-dependency-plugin - -Requires: javassist -Requires: jpackage-utils -Requires: java-headless +Source0: %{name}-%{version}.tar.xz + +BuildRequires: maven-local +BuildRequires: mvn(javassist:javassist) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin) +BuildRequires: mvn(org.jboss:jboss-parent:pom:) %description This package provides capability to perform bytecode injection as part of build. %package javadoc Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. @@ -50,33 +31,19 @@ This package contains the API documentation for %{name}. %setup -q %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build %install -# JAR -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar - -# APIDOCS -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -rp target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name} - -# POM -install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} -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 -%files -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%{_javadir}/* - -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %changelog +* Thu May 29 2014 Mikolaj Izdebski - 1.0.2-11 +- Update to current packaging guidelines + * Tue Mar 04 2014 Stanislav Ochotnicky - 1.0.2-10 - Use Requires: java-headless rebuild (#1067528)