commit d52782b25e6eaf3b8976253aa20947b9e19a23cf Author: gil puntogil@libero.it Date: Fri Jul 5 23:31:26 2013 +0200
switch to XMvn
.gitignore | 1 + mvel.spec | 60 +++++++++++++++++------------------------------------------- sources | 2 +- 3 files changed, 19 insertions(+), 44 deletions(-) --- diff --git a/.gitignore b/.gitignore index a9a71eb..0d7ef7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /mvel-2.0.19.tar.xz +/mvel2-2.0.19.tar.gz diff --git a/mvel.spec b/mvel.spec index 9e33a94..3acb108 100644 --- a/mvel.spec +++ b/mvel.spec @@ -1,21 +1,16 @@ - Name: mvel Version: 2.0.19 -Release: 4%{?dist} +Release: 5%{?dist} Summary: MVFLEX Expression Language -Group: Development/Libraries License: ASL 2.0 Url: http://mvel.codehaus.org/ -# git clone git://github.com/mikebrock/mvel.git mvel2-2.0.18 -# cd mvel-2.0.19/ && git archive --format=tar --prefix=mvel2-2.0.19/ mvel2-2.0.19 | xz > ../mvel2-2.0.19.tar.xz -Source0: %{name}-%{version}.tar.xz -Source1: mvel-script -Patch0: mvel-2.0.19-use-system-asm.patch +Source0: https://github.com/mikebrock/mvel/archive/%%7Bname%7D2-%%7Bversion%7D.tar.gz +Source1: %{name}-script +Patch0: %{name}-2.0.19-use-system-asm.patch # remove tests which require internal objectweb-asm libraries -Patch1: mvel-2.0.19-tests.patch -BuildRequires: java-devel -BuildRequires: jpackage-utils +Patch1: %{name}-2.0.19-tests.patch
+BuildRequires: java-devel BuildRequires: objectweb-asm
# test deps @@ -23,20 +18,10 @@ BuildRequires: junit BuildRequires: xstream
BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-bundle -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 BuildRequires: maven-surefire-report-plugin
-Requires: objectweb-asm - -Requires: java -Requires: jpackage-utils BuildArch: noarch
%description @@ -45,15 +30,13 @@ provides a plethora of features and is suited for everything from the smallest property binding and extraction, to full blown scripts.
%package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils
%description javadoc This package contains javadoc for %{name}.
%prep -%setup -q +%setup -q -n %{name}-%{name}2-%{version} find . -name "*.jar" -delete find . -name "*.class" -delete rm ASM-LICENSE.txt @@ -66,36 +49,28 @@ sed -i 's/\r//' LICENSE.txt native2ascii -encoding UTF8 src/main/java/org/mvel2/sh/ShellSession.java src/main/java/org/mvel2/sh/ShellSession.java
%build +%mvn_file :%{name}2 %{name} # some test at random fails -mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true install javadoc:aggregate +%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.failure.ignore=true
%install - -mkdir -p %{buildroot}%{_javadir} -install -pm 644 target/%{name}2-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -rp target/site/api*/* %{buildroot}%{_javadocdir}/%{name} +%mvn_install
mkdir -p %{buildroot}%{_bindir} install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}
-%files +%files -f .mfiles %{_bindir}/%{name} -%{_javadir}/%{name}*.jar -%{_mavenpomdir}/JPP-%{name}.pom -%{_mavendepmapfragdir}/%{name} %doc LICENSE.txt
-%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc LICENSE.txt
%changelog +* Fri Jul 05 2013 gil cattaneo puntogil@libero.it 2.0.19-5 +- switch to XMvn +- minor changes to adapt to current guideline + * Thu Feb 14 2013 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 2.0.19-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -107,5 +82,4 @@ install -pm 755 %{SOURCE1} %{buildroot}%{_bindir}/%{name} - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Sat May 26 2012 gil cattaneo puntogil@libero.it 2.0.19-1 -- initial rpm - +- initial rpm \ No newline at end of file diff --git a/sources b/sources index 49ffc81..4658ebb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9fe3e07aebc680950b028089bd263cb2 mvel-2.0.19.tar.xz +0cd65dc98aba3041bc3502f73f6d392e mvel2-2.0.19.tar.gz
java-sig-commits@lists.fedoraproject.org