forked from pool/xz-java
Compare commits
3 Commits
Author | SHA256 | Date | |
---|---|---|---|
25d5bba7ba | |||
14a6bc2318 | |||
a7e0d10fb1 |
@@ -1,37 +0,0 @@
|
||||
--- a/build.xml 2025-07-03 17:34:58.653124868 +0200
|
||||
+++ b/build.xml 2025-07-03 17:50:13.872136109 +0200
|
||||
@@ -68,6 +68,16 @@
|
||||
includesfile="fileset-src9.txt">
|
||||
<compilerarg compiler="modern" line="-Xlint"/>
|
||||
<compilerarg compiler="modern" line="-implicit:none"/>
|
||||
+ <exclude name="**/module-info.java"/>
|
||||
+ </javac>
|
||||
+ <javac unless:true="${java8only}"
|
||||
+ srcdir="." sourcepath="${src9_dir}:${src_dir}"
|
||||
+ destdir="${classes_dir}"
|
||||
+ includeAntRuntime="false" debug="${debug}"
|
||||
+ release="${sourcever9}">
|
||||
+ <compilerarg compiler="modern" line="-Xlint"/>
|
||||
+ <compilerarg compiler="modern" line="-implicit:none"/>
|
||||
+ <include name="**/module-info.java"/>
|
||||
</javac>
|
||||
</target>
|
||||
|
||||
@@ -102,7 +112,7 @@
|
||||
|
||||
<jar destfile="${jar_dir}/xz.jar" modificationtime="${timestamp}"
|
||||
manifest="${manifest_base}">
|
||||
- <fileset dir="${classes_dir}" includes="org/tukaani/xz/**"/>
|
||||
+ <fileset dir="${classes_dir}" includes="org/tukaani/xz/**,**/module-info.class"/>
|
||||
<zipfileset prefix="META-INF/versions/9/" dir="${classes9_dir}"
|
||||
unless:true="${java8only}"/>
|
||||
<manifest>
|
||||
@@ -112,6 +122,8 @@
|
||||
<attribute name="Sealed" value="true"/>
|
||||
<attribute name="Multi-Release" value="true"
|
||||
unless:true="${java8only}"/>
|
||||
+ <attribute name="Automatic-Module-Name" value="org.tukaani.xz"
|
||||
+ if:true="${java8only}"/>
|
||||
<!-- Attributes for OSGi bundles: -->
|
||||
<attribute name="Bundle-ManifestVersion" value="2"/>
|
||||
<attribute name="Bundle-SymbolicName" value="org.tukaani.xz"/>
|
@@ -1,13 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 3 15:55:06 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* xz-java-module-info.patch
|
||||
+ Do not put the module-info.class into multirelease directory
|
||||
+ If building with Java 8 only, specify in the manifest the
|
||||
Automatic-Module-Name, so that it can be recognized as
|
||||
modular jar even in that configuration
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 2 15:55:10 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
|
10
xz-java.spec
10
xz-java.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package xz-java
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2013 Peter Conrad
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@@ -24,8 +24,7 @@ Summary: Pure Java implementation of XZ compression
|
||||
License: 0BSD
|
||||
Group: Development/Libraries/Java
|
||||
URL: https://tukaani.org/xz/java.html
|
||||
Source0: https://tukaani.org/xz/xz-java-%{version}.zip
|
||||
Patch0: xz-java-module-info.patch
|
||||
Source: https://tukaani.org/xz/xz-java-%{version}.zip
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
@@ -49,10 +48,9 @@ This package contains the API documentation of xz-java.
|
||||
|
||||
%prep
|
||||
%setup -q -c -n %{name}
|
||||
%patch -P 0 -p1
|
||||
|
||||
%build
|
||||
ant -Dant.build.javac.{source,target}=8 clean jar doc maven
|
||||
%{ant} -Dant.build.javac.{source,target}=8 clean jar doc maven
|
||||
|
||||
%install
|
||||
# jar
|
||||
@@ -64,7 +62,7 @@ install -dm 0755 %{buildroot}%{_mavenpomdir}
|
||||
%{mvn_install_pom} build/maven/xz-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}.pom
|
||||
%add_maven_depmap %{name}.pom %{name}.jar
|
||||
# javadoc
|
||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||
mkdir -p %{buildroot}%{_javadocdir}/%{name}
|
||||
cp -pr build/doc/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%fdupes -s %{buildroot}%{_javadocdir}
|
||||
|
||||
|
Reference in New Issue
Block a user