From 7f3c65e2797f6d49d709bf90cb3fbc44d9e5e045 Mon Sep 17 00:00:00 2001 From: gil Date: Jul 08 2013 05:48:05 +0000 Subject: switch to XMvn --- diff --git a/glassfish-legal.spec b/glassfish-legal.spec index 344f7c6..5c9c530 100644 --- a/glassfish-legal.spec +++ b/glassfish-legal.spec @@ -1,8 +1,7 @@ Name: glassfish-legal Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Legal License for glassfish code -Group: Development/Libraries License: CDDL or GPLv2 with exceptions URL: http://glassfish.java.net/ # svn export https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/ glassfish-legal-1.1 @@ -13,15 +12,9 @@ BuildRequires: java-devel BuildRequires: glassfish-master-pom BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-jar-plugin BuildRequires: maven-remote-resources-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin Requires: glassfish-master-pom - -Requires: java BuildArch: noarch %description @@ -35,23 +28,19 @@ cp -p src/main/resources/META-INF/LICENSE.txt . %build -mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 package +%mvn_file :legal %{name} +%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 %install +%mvn_install -mkdir -p %{buildroot}%{_javadir} -install -pm 644 target/legal-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap - -%files -%{_javadir}/%{name}.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE.txt %changelog +* Mon Jul 08 2013 gil cattaneo 1.1-2 +- switch to XMvn +- minor changes to adapt to current guideline + * Wed Jan 16 2013 gil cattaneo 1.1-1 - initial rpm \ No newline at end of file