Attachment 884165 Details for Bug 1085472 – Fix hamcrest12 classpath

[patch] Fix hamcrest12 classpath

0001-Fix-hamcrest12-classpath.patch (text/plain), 2.63 KB, created by Michael Simacek on 2014-04-08 16:44:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Simacek

Created: 2014-04-08 16:44:44 UTC

Size: 2.63 KB

patch

obsolete

>From 5ad854a65619a092840c3774c9f7da007faafe83 Mon Sep 17 00:00:00 2001
>From: Michael Simacek <msimacek@redhat.com>
>Date: Tue, 8 Apr 2014 18:37:15 +0200
>Subject: [PATCH] Fix hamcrest12 classpath
>
>Signed-off-by: Michael Simacek <msimacek@redhat.com>
>---
> jmock-2.5.1-use_system_libraries.patch | 8 ++++----
> jmock.spec                             | 5 ++++-
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
>diff --git a/jmock-2.5.1-use_system_libraries.patch b/jmock-2.5.1-use_system_libraries.patch
>index ee69484..357ea58 100644
>--- a/jmock-2.5.1-use_system_libraries.patch
>+++ b/jmock-2.5.1-use_system_libraries.patch
>@@ -7,8 +7,8 @@
> -		<fileset dir="lib" includes="*.jar" excludes="*-src.jar"/>
> +		<fileset dir="/usr/share/java" includes="bsh.jar"/>
> +		<fileset dir="/usr/share/java" includes="cglib.jar"/>
>-+		<fileset dir="/usr/share/java" includes="hamcrest12/core.jar"/>
>-+		<fileset dir="/usr/share/java" includes="hamcrest12/library.jar"/>
>++		<fileset dir="/usr/share/java" includes="hamcrest12/hamcrest-core-1.2.jar"/>
>++		<fileset dir="/usr/share/java" includes="hamcrest12/hamcrest-library-1.2.jar"/>
> +		<fileset dir="/usr/share/java" includes="junit4.jar"/>
> +		<fileset dir="/usr/share/java" includes="objenesis.jar"/>
> +		<fileset dir="/usr/share/java" includes="objectweb-asm/asm.jar"/>
>@@ -21,8 +21,8 @@
>  				<fileset dir="${distdir}" includes="*.jar"/>
> +				<fileset dir="/usr/share/java" includes="bsh.jar"/>
> +				<fileset dir="/usr/share/java" includes="cglib.jar"/>
>-+				<fileset dir="/usr/share/java" includes="hamcrest12/core.jar"/>
>-+				<fileset dir="/usr/share/java" includes="hamcrest12/library.jar"/>
>++				<fileset dir="/usr/share/java" includes="hamcrest12/hamcrest-core-1.2.jar"/>
>++				<fileset dir="/usr/share/java" includes="hamcrest12/hamcrest-library-1.2.jar"/>
> +				<fileset dir="/usr/share/java" includes="junit4.jar"/>
> +				<fileset dir="/usr/share/java" includes="objenesis.jar"/>
> +				<fileset dir="/usr/share/java" includes="objectweb-asm/asm.jar"/>
>diff --git a/jmock.spec b/jmock.spec
>index 40921b8..af6c4d7 100644
>--- a/jmock.spec
>+++ b/jmock.spec
>@@ -3,7 +3,7 @@
> 
> Name:          jmock
> Version:       2.5.1
>-Release:       5%{?dist}
>+Release:       6%{?dist}
> Summary:       Java library for testing code with mock objects
> Group:         Development/Libraries
> License:       BSD
>@@ -145,6 +145,9 @@ cp -pr build/%{name}-%{namedversion}/doc/* %{buildroot}%{_javadocdir}/%{name}
> %doc LICENSE.txt
> 
> %changelog
>+* Tue Apr 08 2014 Michael Simacek <msimacek@redhat.com> - 2.5.1-6
>+- Fix hamcrest12 classpath
>+
> * Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 2.5.1-5
> - Use Requires: java-headless rebuild (#1067528)
> 
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1085472: 884165 | 884300