From c2dd422e99a00f4e631c7a7836eec95fc753452e Mon Sep 17 00:00:00 2001 From: Marek Goldmann Date: Jul 21 2014 06:43:58 +0000 Subject: Switch to xmvn --- diff --git a/hibernate-jpa-2.0-api.spec b/hibernate-jpa-2.0-api.spec index c67d6da..fe9786a 100644 --- a/hibernate-jpa-2.0-api.spec +++ b/hibernate-jpa-2.0-api.spec @@ -3,7 +3,7 @@ Name: hibernate-jpa-2.0-api Version: 1.0.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Java Persistence 2.0 (JSR 317) API Group: Development/Libraries @@ -18,12 +18,9 @@ Patch1: %{name}-%{namedversion}-osgi-manifest.patch BuildArch: noarch -Requires: jpackage-utils -BuildRequires: jpackage-utils BuildRequires: java-devel BuildRequires: maven-local - BuildRequires: maven-surefire-provider-junit BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin @@ -39,7 +36,6 @@ Hibernate definition of the Java Persistence 2.0 (JSR 317) API. %package javadoc Summary: Javadocs for %{name} Group: Documentation -Requires: jpackage-utils %description javadoc This package contains the API documentation for %{name}. @@ -52,34 +48,25 @@ This package contains the API documentation for %{name}. %pom_xpath_remove pom:build/pom:extensions %build -mvn-rpmbuild install javadoc:aggregate +%mvn_build %install # Fixing wrong-file-end-of-line-encoding sed -i 's/\r//' target/site/apidocs/jdstyle.css -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p target/%{name}-%{namedversion}.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 +%mvn_install -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -%files -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%{_javadir}/* +%files -f .mfiles +%dir %{_javadir}/%{name} %doc license.txt -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc license.txt %changelog +* Mon Jul 21 2014 Marek Goldmann - 1.0.1-15 +- Switch to xmvn + * Sat Jun 07 2014 Fedora Release Engineering - 1.0.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild