Fridrich Strba 2022-03-23 07:42:35 +00:00 committed by Git OBS Bridge
parent d2cf1a17ca
commit 5b696a18f9
2 changed files with 9 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 23 07:42:14 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source and target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 12 17:56:43 UTC 2019 - Fridrich Strba <fstrba@suse.com> Tue Nov 12 17:56:43 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package nekohtml # spec file for package nekohtml
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# Copyright (c) 2000-2009, JPackage Project # Copyright (c) 2000-2009, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -30,7 +30,7 @@ URL: http://nekohtml.sourceforge.net/
# tar cJf nekohtml-1.9.22.tar.xz nekohtml-1.9.22/ # tar cJf nekohtml-1.9.22.tar.xz nekohtml-1.9.22/
Source0: %{name}-%{version}.tar.xz Source0: %{name}-%{version}.tar.xz
Source2: nekohtml-component-info.xml Source2: nekohtml-component-info.xml
Source3: http://central.maven.org/maven2/net/sourceforge/%{name}/%{name}/%{version}/%{name}-%{version}.pom Source3: https://repo1.maven.org/maven2/net/sourceforge/%{name}/%{name}/%{version}/%{name}-%{version}.pom
Patch1: 0002-Jar-paths.patch Patch1: 0002-Jar-paths.patch
# Add proper attributes to MANIFEST.MF file so bundle can be used by other OSGI bundles. # Add proper attributes to MANIFEST.MF file so bundle can be used by other OSGI bundles.
Patch2: 0003-Add-OSGi-attributes.patch Patch2: 0003-Add-OSGi-attributes.patch
@ -38,6 +38,7 @@ BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: bcel BuildRequires: bcel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: xerces-j2 >= 2.7.1 BuildRequires: xerces-j2 >= 2.7.1
BuildRequires: xml-apis BuildRequires: xml-apis
@ -94,7 +95,7 @@ rm data/meta/test-meta-encoding3.html
%build %build
export CLASSPATH=$(build-classpath bcel xerces-j2 xml-apis) export CLASSPATH=$(build-classpath bcel xerces-j2 xml-apis)
%{ant} \ %{ant} \
-Dcompile.source=1.6 -Dcompile.target=1.6 \ -Dcompile.source=1.8 -Dcompile.target=1.8 \
-Dbuild.sysclasspath=first \ -Dbuild.sysclasspath=first \
-Dlib.dir=%{_javadir} \ -Dlib.dir=%{_javadir} \
-Djar.file=%{name}.jar \ -Djar.file=%{name}.jar \