Hello community, here is the log from the commit of package jformatstring for openSUSE:Factory checked in at 2017-09-23 21:34:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jformatstring (Old) and /work/SRC/openSUSE:Factory/.jformatstring.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jformatstring" Sat Sep 23 21:34:53 2017 rev:13 rq:528155 version:0 Changes: -------- --- /work/SRC/openSUSE:Factory/jformatstring/jformatstring.changes 2014-07-11 20:05:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jformatstring.new/jformatstring.changes 2017-09-23 21:34:56.340310633 +0200 @@ -1,0 +2,11 @@ +Mon Sep 18 12:00:25 UTC 2017 - [email protected] + +- Fix build with jdk9: source 1.6 and target 1.6 +- Clean spec file and fix duplicate waste +- Added patch: + * jformatstring-sourcetarget.patch + - Don't hardcode source and target, but allow it to be + specified to ant on command-line +- Remove any traces of gcj_support + +------------------------------------------------------------------- New: ---- jformatstring-sourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jformatstring.spec ++++++ --- /var/tmp/diff_new_pack.NA1wpJ/_old 2017-09-23 21:34:57.688121085 +0200 +++ /var/tmp/diff_new_pack.NA1wpJ/_new 2017-09-23 21:34:57.696119960 +0200 @@ -1,7 +1,7 @@ # # spec file for package jformatstring # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -17,16 +17,6 @@ # -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} -%bcond_with gcj_support -%if %with gcj_support -%define gcj_support 1 -%else -%define gcj_support 0 -%endif Name: jformatstring Version: 0 Release: 0 @@ -36,18 +26,15 @@ Url: https://jformatstring.dev.java.net/ # svn -q export -r 8 https://jformatstring.dev.java.net/svn/jformatstring/trunk/jFormatString jformatstring-0 --username guest --password guest && tar cjf jformatstring-0.tar.bz2 jformatstring-0 Source0: jformatstring-0.tar.bz2 +Patch0: jformatstring-sourcetarget.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: junit Provides: jFormatString = %{version}-%{release} Obsoletes: jFormatString < %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -%else BuildArch: noarch -%endif %description This project is derived from Sun's implementation of java.util.Formatter. It @@ -68,6 +55,7 @@ %package javadoc Summary: Javadoc for %{name} +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; Group: Development/Documentation Requires: java-javadoc @@ -76,17 +64,15 @@ %prep %setup -q - -mkdir lib -pushd lib -ln -s $(build-classpath junit) -popd +%patch0 -p1 +mkdir -p lib +build-jar-repository -s -p lib junit %build export CLASSPATH= export OPT_JAR_LIST=: -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 -javadoc -d javadoc \ +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 +javadoc -d javadoc -source 1.6 \ -sourcepath src/java \ -classpath build/classes:$(build-classpath junit) \ -link %{_javadocdir}/java \ @@ -102,40 +88,19 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jFormatString-%{version} ln -s jFormatString-%{version} %{buildroot}%{_javadocdir}/jFormatString -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - -%if %{gcj_support} -%post -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi - -%postun -if [ -x %{_bindir}/rebuild-gcj-db ]; then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files -%defattr(0644,root,root,0755) %doc LICENSE %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar %{_javadir}/jFormatString-%{version}.jar %{_javadir}/jFormatString.jar -%if %{gcj_support} -%dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/* -%endif %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %{_javadocdir}/jFormatString-%{version} ++++++ jformatstring-sourcetarget.patch ++++++ --- jformatstring-0/build.xml 2008-10-16 07:22:04.000000000 +0200 +++ jformatstring-0/build.xml 2017-09-18 13:54:04.825372158 +0200 @@ -10,7 +10,7 @@ <target name="classes"> <mkdir dir="build/classes"/> - <javac destdir="build/classes" source="1.5" target="1.5" debug="on"> + <javac destdir="build/classes" debug="on"> <src path="src/java"/> <src path="src/junit"/> <classpath>
