From 17a76251428a89461561a95e699359732f38b88b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 23 Feb 2012 08:38:59 +0100 Subject: [PATCH] fixed for JDK7 --- JRockitInstantntiatorCharacters.patch | 24 ++++++++++++++++++++++++ objenesis.spec | 10 +++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 JRockitInstantntiatorCharacters.patch diff --git a/JRockitInstantntiatorCharacters.patch b/JRockitInstantntiatorCharacters.patch new file mode 100644 index 0000000..19d8e48 --- /dev/null +++ b/JRockitInstantntiatorCharacters.patch @@ -0,0 +1,24 @@ +diff -r a6eb6f4f2a1b objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java +--- a/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java Mon Feb 20 09:13:19 2012 +0100 ++++ b/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java Mon Feb 20 09:15:05 2012 +0100 +@@ -7,7 +7,7 @@ + * + * BEA does not guarantee that the code works, and provides no support for it. Use at your own risk. + * +- * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik Ståhl, BEA JRockit Product Manager. ++ * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St\u00E0hl, BEA JRockit Product Manager. + * + */ + package org.objenesis.instantiator.jrockit; +diff -r a6eb6f4f2a1b objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java +--- a/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java Mon Feb 20 09:13:19 2012 +0100 ++++ b/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java Mon Feb 20 09:15:05 2012 +0100 +@@ -7,7 +7,7 @@ + * + * BEA does not guarantee that the code works, and provides no support for it. Use at your own risk. + * +- * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik Ståhl, BEA JRockit Product Manager. ++ * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St\u00E0hl, BEA JRockit Product Manager. + * + */ + diff --git a/objenesis.spec b/objenesis.spec index 8a3bc75..c80033d 100644 --- a/objenesis.spec +++ b/objenesis.spec @@ -31,7 +31,7 @@ Summary: A library for instantiating Java objects Name: objenesis Version: 1.2 -Release: 8%{dist} +Release: 9%{dist} Group: Development/Libraries License: ASL 2.0 URL: http://objenesis.googlecode.com/svn/docs/index.html @@ -45,6 +45,7 @@ Source0: %{name}-%{version}.tar.xz # Remove deps for test scope (unavailable); fix # maven-license-plugin groupID to latest version available. Patch1: 001-objenesis-fix-build.patch +Patch2: JRockitInstantntiatorCharacters.patch BuildRequires: jpackage-utils BuildRequires: java-devel @@ -58,6 +59,7 @@ BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-resources-plugin +BuildRequires: maven-remote-resources-plugin BuildRequires: maven-site-plugin BuildRequires: maven-shade-plugin BuildRequires: maven-source-plugin @@ -66,6 +68,7 @@ BuildRequires: maven-license-plugin BuildRequires: maven-timestamp-plugin BuildRequires: xpp3-minimal BuildRequires: asm2 +BuildRequires: apache-resource-bundles Requires: java BuildRequires: jpackage-utils @@ -120,6 +123,7 @@ This package contains the API documentation for %{name}. %setup -q #%%patch0 -b .sav0 %patch1 -p1 +%patch2 -p2 %build @@ -180,6 +184,10 @@ cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck %changelog +* Mon Feb 20 2012 Jiri Vanek 1.2-9 +- Added patch2 - JRockitInstantntiatorCharacters.patch to fix unmappable characters +- Added build requires apache-resource-bundles and maven-remote-resources-plugin + * Fri Jan 13 2012 Fedora Release Engineering - 1.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild