From 16d6166b282c29867f9badc64018ebe07e6e5783 Mon Sep 17 00:00:00 2001 From: Guido Grazioli Date: May 14 2012 06:58:05 +0000 Subject: Update to current Java packaging guidelines - Remove maven-eclipse-plugin BR --- diff --git a/objenesis.spec b/objenesis.spec index c80033d..cba4cb5 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -31,7 +31,7 @@ Summary: A library for instantiating Java objects Name: objenesis Version: 1.2 -Release: 9%{dist} +Release: 10%{dist} Group: Development/Libraries License: ASL 2.0 URL: http://objenesis.googlecode.com/svn/docs/index.html @@ -54,7 +54,6 @@ BuildRequires: maven BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-compiler-plugin -BuildRequires: maven-eclipse-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin @@ -71,10 +70,7 @@ BuildRequires: asm2 BuildRequires: apache-resource-bundles Requires: java -BuildRequires: jpackage-utils - -Requires(post): jpackage-utils -Requires(postun): jpackage-utils +Requires: jpackage-utils BuildArch: noarch @@ -102,7 +98,6 @@ when this is useful: %package javadoc Group: Documentation Summary: Javadoc for %{name} -Requires: %{name} = %{version}-%{release} Requires: jpackage-utils BuildArch: noarch @@ -144,19 +139,17 @@ mvn-rpmbuild -e \ %install -rm -rf $RPM_BUILD_ROOT - # jars install -Dp -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-parent.pom -%add_to_maven_depmap org.objenesis objenesis-parent %{version} JPP %{name}-parent +%add_maven_depmap JPP-%{name}-parent.pom install -Dp -m 644 main/target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar install -Dp -m 644 main/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_to_maven_depmap org.objenesis objenesis %{version} JPP %{name} +%add_maven_depmap JPP-%{name}.pom %{name}.jar install -Dp -m 644 tck/target/%{name}-tck-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tck.jar install -Dp -m 644 tck/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-tck.pom -%add_to_maven_depmap org.objenesis objenesis-tck %{version} JPP %{name}-tck +%add_maven_depmap JPP-%{name}-tck.pom %{name}-tck.jar # javadoc install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/main @@ -165,25 +158,22 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files -%defattr(-,root,root,-) %doc LICENSE.txt %{_javadir}/*.jar %{_mavenpomdir}/* %{_mavendepmapfragdir}/* %files javadoc -%defattr(-,root,root,-) +%doc LICENSE.txt %{_javadocdir}/%{name} %changelog +* Mon May 14 2012 Guido Grazioli 1.2-10 +- Update to current Java packaging guidelines +- Remove maven-eclipse-plugin BR + * Mon Feb 20 2012 Jiri Vanek 1.2-9 - Added patch2 - JRockitInstantntiatorCharacters.patch to fix unmappable characters - Added build requires apache-resource-bundles and maven-remote-resources-plugin