Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package hsqldb for openSUSE:Factory checked
in at 2024-09-24 17:32:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hsqldb (Old)
and /work/SRC/openSUSE:Factory/.hsqldb.new.29891 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hsqldb"
Tue Sep 24 17:32:44 2024 rev:36 rq:1202688 version:2.7.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/hsqldb/hsqldb.changes 2024-09-23
15:21:00.202409663 +0200
+++ /work/SRC/openSUSE:Factory/.hsqldb.new.29891/hsqldb.changes 2024-09-24
17:32:58.752333081 +0200
@@ -1,0 +2,9 @@
+Mon Sep 23 13:32:15 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Added patch:
+ * reproducible-jar-mtime.patch
+ + Don't add the Main-Class after jar creation, but during
+ + Fixes manifest timestamp
+- Clean the spec file
+
+-------------------------------------------------------------------
New:
----
reproducible-jar-mtime.patch
BETA DEBUG BEGIN:
New:- Added patch:
* reproducible-jar-mtime.patch
+ Don't add the Main-Class after jar creation, but during
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hsqldb.spec ++++++
--- /var/tmp/diff_new_pack.JeQWYB/_old 2024-09-24 17:32:59.568367242 +0200
+++ /var/tmp/diff_new_pack.JeQWYB/_new 2024-09-24 17:32:59.572367410 +0200
@@ -40,14 +40,14 @@
# Javadoc fails to create since apidocs folder is deleted and not recreated
Patch0: hsqldb-apidocs.patch
Patch1: hsqldb-mdescriptor.patch
-Patch3: harden_hsqldb.service.patch
+Patch2: harden_hsqldb.service.patch
+Patch3: reproducible-jar-mtime.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
# Needed for maven conversions
-BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
+BuildRequires: javapackages-local >= 6
BuildRequires: junit
BuildRequires: pkgconfig
BuildRequires: servletapi5
@@ -128,21 +128,23 @@
%build
pushd build
export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
-ant hsqldb javadoc -Dservletapi.lib=$(build-classpath glassfish-servlet-api)
+%{ant} \
+ -Dservletapi.lib=$(build-classpath glassfish-servlet-api) \
+ hsqldb javadoc
popd
%install
# jar
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -dm 0755 %{buildroot}%{_javadir}
+install -pm 0644 lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
# systemd
-install -d -m 755 %{buildroot}%{_unitdir}
-install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
-install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
-install -m 755 %{SOURCE7} %{buildroot}%{_libexecdir}/%{name}/%{name}-wrapper
-install -m 755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}/%{name}-post
-install -m 755 %{SOURCE9} %{buildroot}%{_libexecdir}/%{name}/%{name}-stop
+install -dm 0755 %{buildroot}%{_unitdir}
+install -dm 0755 %{buildroot}%{_libexecdir}/%{name}
+install -pm 0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}.service
+install -pm 0755 %{SOURCE7} %{buildroot}%{_libexecdir}/%{name}/%{name}-wrapper
+install -pm 0755 %{SOURCE8} %{buildroot}%{_libexecdir}/%{name}/%{name}-post
+install -pm 0755 %{SOURCE9} %{buildroot}%{_libexecdir}/%{name}/%{name}-stop
# rchsqldb link
install -d -m 0755 %{buildroot}/%{_sbindir}/
@@ -153,35 +155,36 @@
install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf
# serverconfig
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}
-install -m 644 %{SOURCE2}
%{buildroot}%{_localstatedir}/lib/%{name}/server.properties
-install -m 644 %{SOURCE3}
%{buildroot}%{_localstatedir}/lib/%{name}/webserver.properties
+install -dm 0755 %{buildroot}%{_localstatedir}/lib/%{name}
+install -pm 0644 %{SOURCE2}
%{buildroot}%{_localstatedir}/lib/%{name}/server.properties
+install -pm 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/lib/%{name}/webserver.properties
install -m 600 %{SOURCE4} %{buildroot}%{_localstatedir}/lib/%{name}/sqltool.rc
# lib
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}/lib
+install -dm 0755 %{buildroot}%{_localstatedir}/lib/%{name}/lib
# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -r doc/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# data
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name}/data
+install -dm 0755 %{buildroot}%{_localstatedir}/lib/%{name}/data
# demo
-install -d -m 755 %{buildroot}%{_datadir}/%{name}/sample
+install -dm 0755 %{buildroot}%{_datadir}/%{name}/sample
rm -f sample/%{name}.init
-install -m 644 sample/* %{buildroot}%{_datadir}/%{name}/sample
+install -pm 0644 sample/* %{buildroot}%{_datadir}/%{name}/sample
# manual
-install -d -m 755 %{buildroot}%{_docdir}/%{name}-%{version}
+install -dm 0755 %{buildroot}%{_docdir}/%{name}-%{version}
cp -pr doc/* %{buildroot}%{_docdir}/%{name}-%{version}
cp -p index.html %{buildroot}%{_docdir}/%{name}-%{version}
cd ..
# Maven metadata
-install -pD -T -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+install -dm 0755 %{buildroot}%{_mavenpomdir}
+%{mvn_install_pom} %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
pushd %{buildroot}%{_localstatedir}/lib/%{name}/lib
# build-classpath can not be used as the jar is not
@@ -218,11 +221,10 @@
%postun
%service_del_postun %{name}.service
-%files
+%files -f ../.mfiles
%defattr(0644,root,root,0755)
%dir %{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}/hsqldb_lic.txt
-%{_javadir}/*
%{_sbindir}/rc%{name}
%{_unitdir}/%{name}.service
%dir %{_libexecdir}/%{name}/
@@ -236,9 +238,6 @@
%attr(0600,hsqldb,hsqldb) %{_localstatedir}/lib/%{name}/sqltool.rc
%dir %{_localstatedir}/lib/%{name}
%config(noreplace) %{_sysconfdir}/%{name}.conf
-%dir %{_mavenpomdir}
-%{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml
%files manual
%defattr(0644,root,root,0755)
++++++ reproducible-jar-mtime.patch ++++++
--- hsqldb/build/build.xml 2024-09-23 15:25:41.743475668 +0200
+++ hsqldb/build/build.xml 2024-09-23 15:28:34.971382483 +0200
@@ -577,6 +577,7 @@
value='Standard runtime'/>
<attribute name='Implementation-Version' value='${build.label}'/>
<attribute name='Sealed' value='true'/>
+ <attribute name='Main-Class'
value='org.hsqldb.util.DatabaseManagerSwing'/>
</manifest>
<fileset refid='minclasses' />
<fileset refid='mainaddedclasses' />
@@ -585,23 +586,6 @@
<fileset refid='${filesetawt.ref}' />
<fileset refid='modinfoclass'/>
</jar>
-
- <!-- Ant jar task doesn't support -e / -Main-Class switch! -->
- <exec executable="${jar.exec.path}" dir="lib"
- outputproperty="out.1" errorproperty="err.1"
- resultproperty="exec.val.1">
- <arg value="-ufe"/>
- <arg value="hsqldb${jdk8string}.jar"/>
- <arg value="org.hsqldb.util.DatabaseManagerSwing"/>
- </exec>
- <condition property="_do-abort" value="DUMMY">
- <not> <equals arg1="0" arg2="${exec.val.1}"/> </not>
- </condition>
- <fail if="_do-abort">Exiting due to 'jar' exit value ${exec.val.1}.
-JVM stdout: ---------------------------------------------------
-${out.1}
-JVM stderr: ---------------------------------------------------
-${err.1}</fail>
</target>
<target name="dbmanswing" depends="-swing, -prep-license-files"
@@ -660,28 +644,12 @@
<attribute name='Class-Path'
value='hsqldb-${hsqldb.version}.jar hsqldb.jar hsqldbmin.jar
hsqldbmain.jar'/>
<attribute name='Sealed' value='true'/>
+ <atttibute name='Main-Class' value='org.hsqldb.cmdline.SqlTool'/>
</manifest>
<fileset refid='sqltoolclasses'/>
<fileset refid='sqltoolres'/>
<fileset refid='modinfoclass'/>
</jar>
-
- <!-- Ant jar task doesn't support -e switch! -->
- <exec executable="${jar.exec.path}" dir="lib"
- outputproperty="out.2" errorproperty="err.2"
- resultproperty="exec.val.2">
- <arg value="-ufe"/>
- <arg value="sqltool${jdk8string}.jar"/>
- <arg value="org.hsqldb.cmdline.SqlTool"/>
- </exec>
- <condition property="_do-abort" value="DUMMY">
- <not> <equals arg1="0" arg2="${exec.val.2}"/> </not>
- </condition>
- <fail if="_do-abort">Exiting due to 'jar' exit value ${exec.val.2}.
-JVM stdout: ---------------------------------------------------
-${out.2}
-JVM stderr: ---------------------------------------------------
-${err.2}</fail>
</target>
<target name="-clone-shared-sources">
