Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=81f30a31a1bb798771b90d01eef414746ec62ab3
commit 81f30a31a1bb798771b90d01eef414746ec62ab3 Author: crazy <[email protected]> Date: Sat May 28 18:05:00 2016 +0200 junit-4.12-1-x86_64 * use bin here too diff --git a/source/devel-extra/junit/FrugalBuild b/source/devel-extra/junit/FrugalBuild index acf2d04..88b4ec3 100644 --- a/source/devel-extra/junit/FrugalBuild +++ b/source/devel-extra/junit/FrugalBuild @@ -3,37 +3,25 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=junit -pkgver=4.10 -pkgrel=2 +pkgver=4.12 +pkgrel=1 pkgdesc="A regression testing framework." -Finclude openjava -url="http://www.junit.org/"; -Fpkgversep="" -_F_archive_grepv="SNAPSHOT" -up2date="Flastarchive https://github.com/KentBeck/junit/downloads .zip" -depends=('hamcrest') +Finclude openjava github +url="http://junit.org/junit4/"; +_F_github_author="$pkgname-team" +_F_github_name="${pkgname}4" +depends=('java-hamcrest') makedepends=('openjdk') groups=('devel-extra') archs=('i686' 'x86_64') -source=(https://github.com/KentBeck/junit/downloads/$pkgname$pkgver.zip \ - workaround_typing_bug.patch) -sha1sums=('2d9663bdfe3079673ff66f1154b42a31b40d8235' \ - '3c81a1861fcd94bb900dc6272285b4435660fcf5') +source=(https://github.com/junit-team/junit4/releases/download/r$pkgver/junit-$pkgver.jar) +sha1sums=('2973d150c0dc1fefe998f834810d68f278ea58ec') build() { - Fcd $pkgname$pkgver - rm -rf src - mkdir -p src - unzip -qq -d src $pkgname-$pkgver-src.jar - rm -rfv javadoc temp.hamcrest.source - Fjavacleanup - mkdir -p classes - Fpatchall - javac -cp $(ls /usr/share/java/hamcrest-*.jar|tr '\n' ':') -d classes \ - -sourcepath src $(find src -name "*.java") || return 1 - echo "Class-Path: hamcrest-core.jar" > MANIFEST - jar -cmf MANIFEST junit.jar -C classes . || return 1 - Fjar junit.jar - Fdocrel README.html doc/ReleaseNotes$pkgver.txt + + Fmkdir usr/share/java/$pkgname + cp -v $Fsrcdir/*jar $Fdestdir/usr/share/java/$pkgname + Fln junit-$pkgver.jar /usr/share/java/$pkgname/$pkgname.jar + } diff --git a/source/devel-extra/junit/workaround_typing_bug.patch b/source/devel-extra/junit/workaround_typing_bug.patch deleted file mode 100644 index b841f59..0000000 --- a/source/devel-extra/junit/workaround_typing_bug.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/src/org/junit/internal/matchers/CombinableMatcher.java -+++ b/src/org/junit/internal/matchers/CombinableMatcher.java -@@ -24,11 +24,11 @@ - - @SuppressWarnings("unchecked") - public CombinableMatcher<T> and(Matcher<? extends T> matcher) { -- return new CombinableMatcher<T>(allOf(matcher, fMatcher)); -+ return new CombinableMatcher<T>(allOf((Matcher)matcher, fMatcher)); - } - - @SuppressWarnings("unchecked") - public CombinableMatcher<T> or(Matcher<? extends T> matcher) { -- return new CombinableMatcher<T>(anyOf(matcher, fMatcher)); -+ return new CombinableMatcher<T>(anyOf((Matcher)matcher, fMatcher)); - } --} -\ No newline at end of file -+} ---- a/src/org/junit/internal/matchers/IsCollectionContaining.java -+++ b/src/org/junit/internal/matchers/IsCollectionContaining.java -@@ -41,7 +41,7 @@ - - @Factory - public static <T> Matcher<Iterable<T>> hasItem(T element) { -- return hasItem(equalTo(element)); -+ return hasItem((Matcher)equalTo(element)); - } - - @Factory -@@ -51,7 +51,7 @@ - for (Matcher<? extends T> elementMatcher : elementMatchers) { - all.add(hasItem(elementMatcher)); - } -- return allOf(all); -+ return allOf((Collection)all); - } - - @Factory -@@ -61,7 +61,7 @@ - for (T element : elements) { - all.add(hasItem(element)); - } -- return allOf(all); -+ return allOf((Collection)all); - } - - } \ No newline at end of file _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
