From 92ac66329a930cfea25a184f63cb823ed552e473 Mon Sep 17 00:00:00 2001 From: gil Date: Feb 02 2014 13:48:05 +0000 Subject: fix junit4-ant deps scope --- diff --git a/randomizedtesting.spec b/randomizedtesting.spec index b122996..e6ec0f6 100644 --- a/randomizedtesting.spec +++ b/randomizedtesting.spec @@ -1,6 +1,6 @@ Name: randomizedtesting Version: 2.0.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java Testing Framework License: ASL 2.0 URL: http://labs.carrotsearch.com/randomizedtesting.html @@ -94,11 +94,12 @@ sed -i '/script.js/d' \ %pom_disable_module examples/ant %pom_disable_module packaging %pom_disable_module junit4-maven-plugin-tests - +# Disable repackaged and shaded deps %pom_remove_plugin com.pyx4me:proguard-maven-plugin junit4-ant %pom_remove_plugin org.codehaus.mojo:exec-maven-plugin junit4-ant %pom_remove_plugin :maven-dependency-plugin junit4-ant - +# Fix deps scope +%pom_xpath_remove "pom:scope[text()='provided']" junit4-ant sed -i 's/\r//' README randomized-runner/README %build @@ -110,11 +111,16 @@ sed -i 's/\r//' README randomized-runner/README %install %mvn_install +#mkdir -p %%{buildroot}%%{_sysconfdir}/ant.d +#echo "ant ant/ant-junit commons-io google-gson guava junit junit4-ant objectweb-asm3/asm %%{name}/randomizedtesting-runner simple-xml" > %%{name}-junit4-ant +#install -p -m 644 %%{name}-junit4-ant %%{buildroot}%%{_sysconfdir}/ant.d/%%{name}-junit4-ant + %files %dir %{_javadir}/%{name} %doc LICENSE README %files junit4-ant -f .mfiles-junit4-ant +#%%config(noreplace) %%{_sysconfdir}/ant.d/%%{name}-junit4-ant %files junit4-maven-plugin -f .mfiles-junit4-maven-plugin @@ -125,6 +131,9 @@ sed -i 's/\r//' README randomized-runner/README %doc LICENSE %changelog +* Sun Feb 02 2014 gil cattaneo 2.0.15-2 +- Fix junit4-ant deps scope + * Thu Jan 23 2014 gil cattaneo 2.0.15-1 - update to 2.0.15