Hello community, here is the log from the commit of package ini4j for openSUSE:Factory checked in at 2015-08-01 11:38:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ini4j (Old) and /work/SRC/openSUSE:Factory/.ini4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ini4j" Changes: -------- --- /work/SRC/openSUSE:Factory/ini4j/ini4j.changes 2014-07-16 16:49:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ini4j.new/ini4j.changes 2015-08-01 11:38:24.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 29 11:29:12 UTC 2015 - tchvatal@suse.com + +- Add patch to build with jdk8: + * ini4j-java8-compat.patch + +------------------------------------------------------------------- New: ---- ini4j-java8-compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ini4j.spec ++++++ --- /var/tmp/diff_new_pack.lpUJYS/_old 2015-08-01 11:38:24.000000000 +0200 +++ /var/tmp/diff_new_pack.lpUJYS/_new 2015-08-01 11:38:24.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ini4j # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ Source0: %{name}-%{version}-sources.tar.bz2 Source1: %{name}-%{version}.build.xml Source2: %{name}-%{version}.buildinfo.properties -#Patch0: ini4j-build.patch +Patch0: ini4j-java8-compat.patch BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes @@ -62,15 +62,17 @@ %prep %setup -q -c -# remove all binary libs -find . -name "*.jar" -exec rm -f {} \; +# remove existing binaries +find . -type f \( -iname "*.jar" -o -iname "*.class" -o -iname "*.exe" -o -iname "*.so" \) | \ + xargs -t rm -f + cp %{SOURCE1} build.xml mkdir -p src/etc cp %{SOURCE2} src%{_sysconfdir}/buildinfo.properties -#%patch0 + +%patch0 -p1 %build -[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 build ant javadoc ++++++ ini4j-java8-compat.patch ++++++ --- ini4j-0.5.1/src/org/ini4j/BasicProfile.java +++ ini4j-0.5.1/src/org/ini4j/BasicProfile.java @@ -138,11 +138,17 @@ return remove((Object) section.getName()); } - @Override public String remove(Object sectionName, Object optionName) + @Override public boolean remove(Object sectionName, Object optionName) { Section sec = get(sectionName); - - return (sec == null) ? null : sec.remove(optionName); + if (sec == null) { + return false; + } + if (sec.containsKey(optionName)) { + sec.remove(optionName); + return true; + } + return false; } boolean isTreeMode() --- ini4j-0.5.1/src/org/ini4j/Profile.java +++ ini4j-0.5.1/src/org/ini4j/Profile.java @@ -43,7 +43,7 @@ Section remove(Profile.Section section); - String remove(Object sectionName, Object optionName); + boolean remove(Object sectionName, Object optionName); interface Section extends OptionMap {