Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aelfred for openSUSE:Factory checked in at 2024-09-30 15:39:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aelfred (Old) and /work/SRC/openSUSE:Factory/.aelfred.new.29891 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aelfred" Mon Sep 30 15:39:54 2024 rev:28 rq:1204560 version:7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/aelfred/aelfred.changes 2024-02-20 21:15:33.296595020 +0100 +++ /work/SRC/openSUSE:Factory/.aelfred.new.29891/aelfred.changes 2024-09-30 15:40:22.064938311 +0200 @@ -1,0 +2,7 @@ +Sun Sep 29 19:43:31 UTC 2024 - Fridrich Strba <[email protected]> + +- Fix build after removal of the default %%{java_home} define +- Refactor the spec file to actually build the jar and not just + to distribute the prebuilt one + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aelfred.spec ++++++ --- /var/tmp/diff_new_pack.FiFEI2/_old 2024-09-30 15:40:22.716965470 +0200 +++ /var/tmp/diff_new_pack.FiFEI2/_new 2024-09-30 15:40:22.716965470 +0200 @@ -22,11 +22,12 @@ Summary: Java-based XML parser License: BSD-3-Clause Group: Development/Libraries/Java -URL: http://saxon.sourceforge.net/aelfred.html +URL: https://saxon.sourceforge.net/aelfred.html Source0: http://downloads.sourceforge.net/project/saxon/aelfred/7.0/aelfred7_0.zip Patch0: aelfred-icedtea-build.patch Patch1: aelfred-javadoc.patch BuildRequires: ant +BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-tools BuildRequires: unzip @@ -54,37 +55,34 @@ %prep %setup -q -c +rm *.jar unzip %{name}-source.zip %patch -P 0 %patch -P 1 -p1 %build -export JAVA_HOME=%{java_home} -export PATH=%{java_home}/bin:$PATH -export CLASSPATH= -cd net -%{javac} -source 8 -target 8 `find . -name \*.java` -%{javadoc} -notimestamp -source 8 -d ../HTML `find . -name \*.java` +mkdir -p classes +javac -source 8 -target 8 -d classes `find net -name \*.java` +javadoc -notimestamp -source 8 -d HTML `find net -name \*.java` +jar \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0} + --date="$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ)" \ +%endif + --create --file=%{name}.jar -C classes . %install # jar -export JAVA_HOME=%{java_home} -cd net -mkdir -p %{buildroot}%{_javadir} -cp -a ../saxon-%{name}.jar \ -%{buildroot}%{_javadir}/%{name}-%{version}.jar -(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \ -ln -s ${jar} ${jar/-%{version}/}; done) +install -dm 0755 %{buildroot}%{_javadir} +install -pm 0644 %{name}.jar %{buildroot}%{_javadir}/%{name}.jar + # javadoc -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -a ../HTML/* %{buildroot}%{_javadocdir}/%{name} +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -a HTML/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) -%{_javadir}/* +%{_javadir}/%{name}.jar %files javadoc -%defattr(0644,root,root,0755) -%dir %{_javadocdir}/%{name} -%{_javadocdir}/%{name}/* +%{_javadocdir}/%{name}
