Hello community, here is the log from the commit of package concurrent for openSUSE:Factory checked in at 2017-05-22 10:48:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/concurrent (Old) and /work/SRC/openSUSE:Factory/.concurrent.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "concurrent" Mon May 22 10:48:10 2017 rev:15 rq:496994 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/concurrent/concurrent.changes 2011-09-23 01:53:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.concurrent.new/concurrent.changes 2017-05-22 10:49:06.523169922 +0200 @@ -1,0 +2,6 @@ +Sat May 20 18:59:35 UTC 2017 - tchva...@suse.com + +- Fix building with java properly, use gcj as anything newer fails + to compile this + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ concurrent.spec ++++++ --- /var/tmp/diff_new_pack.RrUjpl/_old 2017-05-22 10:49:07.075092131 +0200 +++ /var/tmp/diff_new_pack.RrUjpl/_new 2017-05-22 10:49:07.075092131 +0200 @@ -1,7 +1,7 @@ # -# spec file for package concurrent (Version 1.3.4) +# spec file for package concurrent # -# Copyright (c) 2009 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,21 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -# icecream 0 - Name: concurrent -BuildRequires: ant java2-devel-packages xml-commons-apis -%define section free Version: 1.3.4 -Release: 270 +Release: 0 Summary: Utility Classes for Concurrent Java Programming License: SUSE-Public-Domain +Group: Development/Libraries/Java +Url: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/ Source0: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/current/concurrent.tar.gz Source1: %{name}-%{version}.build.xml -Url: http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/ -Group: Development/Libraries/Java +BuildRequires: ant +BuildRequires: java-1_5_0-gcj-compat-devel +#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel +#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel +#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel +#!BuildIgnore: java-9-openjdk java-9-openjdk-devel +Obsoletes: %{name}-javadoc BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -41,61 +43,26 @@ of the rationale and application of several of these classes can be found in the second edition of Concurrent Programming in Java. - - -%package javadoc -License: SUSE-Public-Domain -PreReq: coreutils -Summary: Javadoc for concurrent -Group: Development/Libraries/Java - -%description javadoc -This package provides standardized, efficient versions of utility -classes commonly encountered in concurrent Java programming. This code -consists of implementations of ideas that have been around for ages, -and is merely intended to save you the trouble of coding them. -Discussions of the rationale and applications of several of these -classes can be found in the second edition of Concurrent Programming in -Java. - -This package contains the javadoc documentation for concurrent. - - - %prep -%setup -c -q +%setup -q -c mkdir -p src/EDU/oswego/cs/dl/util mv concurrent src/EDU/oswego/cs/dl/util cp %{SOURCE1} build.xml %build +#export JAVA_HOME="/usr/lib64/jvm/jre" ant \ -Dversion=%{version} \ -Dj2se.apiurl=%{_javadocdir}/java \ - jar javadoc + jar %install -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/ -ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink - -%clean -rm -rf $RPM_BUILD_ROOT - -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} +install -d -m 755 %{buildroot}%{_javadir} +install -m 644 %{name}-%{version}.jar %{buildroot}%{_javadir}/ +ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar %files %defattr(0644,root,root,0755) %{_javadir}/*.jar -%files javadoc -%defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} - %changelog ++++++ concurrent-1.3.4.build.xml ++++++ --- /var/tmp/diff_new_pack.RrUjpl/_old 2017-05-22 10:49:07.119085930 +0200 +++ /var/tmp/diff_new_pack.RrUjpl/_new 2017-05-22 10:49:07.119085930 +0200 @@ -15,8 +15,8 @@ debug="on" optimize="on" destdir="${build}" - source="1.4" - target="1.4" + source="1.5" + target="1.5" /> </target>
