Hello community, here is the log from the commit of package openmarkup for openSUSE:Factory checked in at 2017-09-20 17:13:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openmarkup (Old) and /work/SRC/openSUSE:Factory/.openmarkup.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openmarkup" Wed Sep 20 17:13:41 2017 rev:13 rq:527447 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/openmarkup/openmarkup.changes 2011-09-23 12:20:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openmarkup.new/openmarkup.changes 2017-09-20 17:13:42.996892385 +0200 @@ -1,0 +2,8 @@ +Wed Sep 20 05:55:14 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target level 1.6 +- Added patch: + * openmarkup-1.1-nosource.patch + + Don't hardcode source level; specify it on the command-line + +------------------------------------------------------------------- New: ---- openmarkup-1.1-nosource.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openmarkup.spec ++++++ --- /var/tmp/diff_new_pack.hZu4Ci/_old 2017-09-20 17:13:43.640801742 +0200 +++ /var/tmp/diff_new_pack.hZu4Ci/_new 2017-09-20 17:13:43.644801179 +0200 @@ -1,7 +1,7 @@ # -# spec file for package openmarkup (Version 1.1) +# spec file for package openmarkup # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -15,23 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: openmarkup Version: 1.1 -Release: 2 +Release: 0 Summary: Open Markup Interface for object realizers and XML object realization -Group: Development/Languages/Java License: LGPL-2.1+ +Group: Development/Languages/Java Url: https://openmarkup.dev.java.net/ #Source: om_1_1.zip Source0: %{name}-%{version}.tar.bz2 Source1: AsyncClients.pdf Source2: XMLContentHandlers.pdf -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: java-devel +Patch0: openmarkup-1.1-nosource.patch BuildRequires: ant +BuildRequires: fdupes +BuildRequires: java-devel BuildArch: noarch %description @@ -46,10 +45,7 @@ compositions, or otherwise manipulating them according to control information embedded in the object descriptions. - - %package javadoc -License: LGPL-2.1+ Summary: Open Markup Interface for object realizers and XML object realization Group: Development/Languages/Java @@ -65,10 +61,7 @@ compositions, or otherwise manipulating them according to control information embedded in the object descriptions. - - %package manual -License: LGPL-2.1+ Summary: Open Markup Interface for object realizers and XML object realization Group: Development/Languages/Java @@ -84,40 +77,36 @@ compositions, or otherwise manipulating them according to control information embedded in the object descriptions. - - %prep %setup -q cp %{SOURCE1} %{SOURCE2} . # wrong end of line encoding sed -i -e 's/.$//' doc/javadoc/stylesheet.css doc/javadoc/package-list Copyright.txt LICENSE.txt +%patch0 -p1 %build -ant -f make/build.xml -Djavaws.dir=%{java_home}/bin +ant \ + -f make/build.xml -Djavaws.dir=%{java_home}/bin \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 %install -install -d -m 755 $RPM_BUILD_ROOT/%{_javadir} -install -m 644 dist/bin/om.jar $RPM_BUILD_ROOT/%{_javadir} +install -d -m 755 %{buildroot}/%{_javadir} +install -m 644 dist/bin/om.jar %{buildroot}/%{_javadir} # javadoc -install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version} -cp -pr doc/javadoc/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}-%{version} +cp -pr doc/javadoc/* %{buildroot}/%{_javadocdir}/%{name}-%{version} +ln -s %{name}-%{version} %{buildroot}/%{_javadocdir}/%{name} +%fdupes -s %{buildroot}/%{_javadocdir}/%{name} %files -%defattr(-,root,root,0755) %doc Copyright.txt LICENSE.txt %{_javadir}/*jar %files javadoc -%defattr(-,root,root) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual -%defattr(-,root,root,0755) %doc AsyncClients.pdf XMLContentHandlers.pdf %changelog ++++++ openmarkup-1.1-nosource.patch ++++++ --- openmarkup-1.1/make/build.xml 2017-09-20 07:46:44.507304390 +0200 +++ openmarkup-1.1/make/build.xml 2017-09-20 07:47:32.083304569 +0200 @@ -95,7 +95,7 @@ <delete dir="${javadoc.dir}" quiet="true"/> </target> <target name="-compile" depends="-prepare"> - <javac srcdir="${src.java}" destdir="${build.classes.dir}" classpathref="compile.classpath" includes="${branch}" source="1.4" deprecation="on" debug="${build.debug}" optimize="${build.optimize}"/> + <javac srcdir="${src.java}" destdir="${build.classes.dir}" classpathref="compile.classpath" includes="${branch}" deprecation="on" debug="${build.debug}" optimize="${build.optimize}"/> </target> <target name="distribute" depends="clean, build, generateDocs"> <copy todir="${dist.doc.dir}/javadoc"> --- openmarkup-1.1/make/javadoc.xml 2017-09-20 07:46:44.507304390 +0200 +++ openmarkup-1.1/make/javadoc.xml 2017-09-20 07:48:47.091304853 +0200 @@ -23,7 +23,7 @@ <mkdir dir="${javadoc.dest.dir}"/> <echo message="javadoc.src.dir = ${javadoc.src.dir}"/> <echo message="javadoc.packageListLoc = ${javadoc.packageListLoc}"/> - <javadoc source="1.4" + <javadoc packagenames="${javadoc.packages}" excludepackagenames="${javadoc.excludes}" sourcepath="${javadoc.src.dir}"
