SHA256
1
0
forked from pool/swing-worker
Fridrich Strba 2022-03-23 05:52:44 +00:00 committed by Git OBS Bridge
parent 8d63a96f81
commit 2b3fcbd0aa
2 changed files with 15 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 23 05:52:23 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Specify java source and target 1.8
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 19 10:53:19 UTC 2017 - fstrba@suse.com Tue Sep 19 10:53:19 UTC 2017 - fstrba@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package swing-worker # spec file for package swing-worker
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -20,17 +20,17 @@ Name: swing-worker
Version: 1.2 Version: 1.2
Release: 0 Release: 0
Summary: UI updates support for long running tasks Summary: UI updates support for long running tasks
License: LGPL-2.1+ License: LGPL-2.1-or-later
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: https://swingworker.dev.java.net/ URL: https://swingworker.dev.java.net/
Source0: %{name}-src-%{version}.tar.bz2 Source0: %{name}-src-%{version}.tar.bz2
Source1: releasenotes.txt Source1: releasenotes.txt
Patch0: swing-worker-1.2-nosource.patch Patch0: swing-worker-1.2-nosource.patch
Patch1: swing-worker-1.2-encoding.patch Patch1: swing-worker-1.2-encoding.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel BuildRequires: java-devel >= 1.8
Requires: java Requires: java >= 1.8
BuildArch: noarch BuildArch: noarch
%description %description
@ -72,14 +72,13 @@ sed -i -e 's/.$//' releasenotes.txt COPYING
%build %build
ant \ ant \
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
bundles bundles
%install %install
install -d -m 755 %{buildroot}/%{_javadir} install -d -m 755 %{buildroot}/%{_javadir}
# jars # jars
install -pm 644 dist/bundles/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar install -pm 644 dist/bundles/%{name}.jar %{buildroot}/%{_javadir}/%{name}.jar
(cd %{buildroot}%{_javadir}/ && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
# javadoc # javadoc
install -d -m 755 %{buildroot}/%{_javadocdir}/%{name} install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
cp -pr dist/javadoc/* %{buildroot}/%{_javadocdir}/%{name} cp -pr dist/javadoc/* %{buildroot}/%{_javadocdir}/%{name}
@ -90,7 +89,8 @@ cp -pr src/demo %{buildroot}/%{_datadir}/%{name}
%fdupes -s %{buildroot}/%{_datadir}/%{name} %fdupes -s %{buildroot}/%{_datadir}/%{name}
%files %files
%doc COPYING releasenotes.txt %license COPYING
%doc releasenotes.txt
%{_javadir}/*.jar %{_javadir}/*.jar
%files javadoc %files javadoc