3 Commits

4 changed files with 49 additions and 36 deletions

View File

@@ -16,3 +16,12 @@
profile: JispLoadTest profile: JispLoadTest
java -Xrunhprof:cpu=samples,file=JispLoadTest.profile JispLoadTest java -Xrunhprof:cpu=samples,file=JispLoadTest.profile JispLoadTest
@@ -16,7 +17,7 @@
jar -cfm jisp.jar JISPJAR.MF com/coyotegulch/jisp/*.class svfl.txt
docs:
- javadoc -d docs com.coyotegulch.jisp
+ javadoc -d docs -notimestamp com.coyotegulch.jisp
clean:
-rm -rf *.class

View File

@@ -0,0 +1,13 @@
--- jisp-2.5.1/Makefile 2024-09-23 17:44:21.056217694 +0200
+++ jisp-2.5.1/Makefile 2024-09-23 17:48:23.961290309 +0200
@@ -12,8 +12,8 @@
jars:
-rm -rf *.jar
- jar -cfm jisp-demo.jar MANIFEST.MF *.class svfl.txt
- jar -cfm jisp.jar JISPJAR.MF com/coyotegulch/jisp/*.class svfl.txt
+ jar --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=jisp-demo.jar --manifest=MANIFEST.MF *.class svfl.txt
+ jar --date="$$(date -u -d @$${SOURCE_DATE_EPOCH:-$$(date +%s)} +%Y-%m-%dT%H:%M:%SZ)" --create --file=jisp.jar --manifest=JISPJAR.MF com/coyotegulch/jisp/*.class svfl.txt
docs:
javadoc -d docs -notimestamp com.coyotegulch.jisp

View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 23 15:58:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* jisp2-2.5.1-reproducible-jar-mtime.patch
+ Use SOURCE_DATE_EPOCH for jar modification times
- Modified patch:
* jisp2-2.5.1-javac-flags.patch
+ build javadoc with the -notimestamp option
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 21 12:37:06 UTC 2024 - Fridrich Strba <fstrba@suse.com> Wed Feb 21 12:37:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@@ -1,7 +1,7 @@
# #
# spec file for package jisp2 # spec file for package jisp2
# #
# Copyright (c) 2024 SUSE LLC # Copyright (c) 2025 SUSE LLC and contributors
# #
# 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
@@ -23,18 +23,16 @@ Release: 0
Summary: The Java Indexed Serialization Package Summary: The Java Indexed Serialization Package
License: Libpng License: Libpng
Group: Development/Libraries/Java Group: Development/Libraries/Java
URL: http://www.coyotegulch.com/jisp/ URL: https://www.coyotegulch.com/jisp/
Source0: jisp-2.5.1-source.tar.bz2 Source0: jisp-2.5.1-source.tar.bz2
Patch0: jisp2-2.5.1-java5-enum.patch Patch0: jisp2-2.5.1-java5-enum.patch
Patch1: jisp2-2.5.1-javac-flags.patch Patch1: jisp2-2.5.1-javac-flags.patch
Patch2: jisp2-2.5.1-reproducible-jar-mtime.patch
# jisp-3.0.0 won't work with jakarta-turbine-jcs # jisp-3.0.0 won't work with jakarta-turbine-jcs
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: make BuildRequires: make
Requires: javapackages-tools Requires: javapackages-tools
Requires(post): update-alternatives
Requires(pre): update-alternatives
Provides: hibernate_in_process_cache
BuildArch: noarch BuildArch: noarch
%description %description
@@ -62,6 +60,9 @@ serialized objects stored in files.
%patch -P 0 -p1 %patch -P 0 -p1
sed -i -e 's/\r$//g' svfl.txt sed -i -e 's/\r$//g' svfl.txt
%patch -P 1 -b .java-cflags %patch -P 1 -b .java-cflags
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 17}%{!?pkg_vcmp:0}
%patch -P 2 -p1
%endif
%build %build
export CLASSPATH= export CLASSPATH=
@@ -71,47 +72,27 @@ export CLASSPATH=
%install %install
# jars # jars
mkdir -p %{buildroot}%{_javadir} install -dm 0755 %{buildroot}%{_javadir}
cp -p jisp.jar \ install -pm 0644 jisp.jar \
%{buildroot}%{_javadir}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc # javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr docs/* %{buildroot}%{_javadocdir}/%{name}
ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
# demo # demo
mkdir -p %{buildroot}%{_datadir}/%{name}-%{version}/lib install -dm 0755 %{buildroot}%{_datadir}/%{name}/lib
cp jisp-demo.jar %{buildroot}%{_datadir}/%{name}-%{version}/lib install -pm 0644 jisp-demo.jar %{buildroot}%{_datadir}/%{name}/lib
cp *.java %{buildroot}%{_datadir}/%{name}-%{version} install -pm 0644 *.java %{buildroot}%{_datadir}/%{name}
cp *.txt %{buildroot}%{_datadir}/%{name}-%{version} install -pm 0644 *.txt %{buildroot}%{_datadir}/%{name}
# hibernate_in_process_cache ghost symlink
mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
ln -sf %{_sysconfdir}/alternatives/hibernate_in_process_cache.jar %{buildroot}%{_javadir}/hibernate_in_process_cache.jar
%post
%{_sbindir}/update-alternatives --install %{_javadir}/hibernate_in_process_cache.jar \
hibernate_in_process_cache %{_javadir}/%{name}.jar 30
%preun
if [ "$1" = "0" ]; then
%{_sbindir}/update-alternatives --remove hibernate_in_process_cache %{_javadir}/%{name}.jar
fi
%files %files
%defattr(0644,root,root,0755)
%doc svfl.txt %doc svfl.txt
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/hibernate_in_process_cache.jar
%ghost %{_sysconfdir}/alternatives/hibernate_in_process_cache.jar
%files demo %files demo
%defattr(0644,root,root,0755) %{_datadir}/%{name}
%{_datadir}/%{name}-%{version}
%files javadoc %files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog