From ee68f538f589c06d97fb8bec4d05e376ef912d4c Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 3 Aug 2018 13:08:08 +0200 Subject: [PATCH] Remove bundled minified js from javadoc --- make-mockito-sourcetarball.sh | 2 +- mockito.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/make-mockito-sourcetarball.sh b/make-mockito-sourcetarball.sh index 195fec1..b653a0c 100755 --- a/make-mockito-sourcetarball.sh +++ b/make-mockito-sourcetarball.sh @@ -13,7 +13,7 @@ rm -rf ${SRCDIR} tar -xf ${SRCDIR}.tar rm ${SRCDIR}.tar pushd ${SRCDIR} -rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat +rm -rf `find -name *.jar` build.gradle cglib-and-asm doc gradle gradlew gradlew.bat javadoc dos2unix `find -name *.java` popd diff --git a/mockito.spec b/mockito.spec index e0253a0..5bf20a6 100644 --- a/mockito.spec +++ b/mockito.spec @@ -1,6 +1,6 @@ Name: mockito Version: 1.10.19 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A Java mocking framework License: MIT @@ -49,13 +49,13 @@ This package contains the API documentation for %{name}. %patch2 -p1 %patch3 -p1 %patch4 -p1 -# workaround rhbz#1292777 Files not found for javadoc generation -touch javadoc/stylesheet.css %pom_add_dep net.sf.cglib:cglib:3.1 maven/mockito-core.pom find . -name "*.java" -exec sed -i "s|org\.%{name}\.cglib|net\.sf\.cglib|g" {} + mkdir -p lib/compile +%pom_xpath_remove 'target[@name="javadoc"]/copy' build.xml + %build build-jar-repository lib/compile objenesis cglib junit hamcrest/core ant jar javadoc @@ -89,6 +89,9 @@ sed -i -e "s|@version@|%{version}|g" maven/%{name}-core.pom %license LICENSE NOTICE %changelog +* Fri Aug 03 2018 Michael Simacek - 1.10.19-17 +- Remove bundled minified js from javadoc + * Fri Jul 13 2018 Fedora Release Engineering - 1.10.19-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 1773385..9093ba5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b42b2fe1d47a2ca5c10a05aa211e357b mockito-1.10.19.tar.xz +SHA512 (mockito-1.10.19.tar.xz) = 339f173ce800dcad8a827069f6e3b08f39e3035a9c16a7051883303e5aa61be6a127664184f2b99349fc095d208ee90cf1824b4a37e349c35bacb785eacc7297