From be57f1a4d4b0785993d43338e3ada62c562fa5c4baf48b8c843a2a956d718ec7 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Thu, 16 Jan 2025 10:24:26 +0000 Subject: [PATCH 1/7] Accepting request 1238209 from home:ecsos:jameica Add missing require OBS-URL: https://build.opensuse.org/request/show/1238209 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jameica?expand=0&rev=40 --- jameica.changes | 5 +++++ jameica.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jameica.changes b/jameica.changes index 7286aad..4965b18 100644 --- a/jameica.changes +++ b/jameica.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 16 10:17:35 UTC 2025 - ecsos + +- Add missing require libgtread-2_0-0. + ------------------------------------------------------------------- Sun Mar 24 14:02:05 UTC 2024 - ecsos diff --git a/jameica.spec b/jameica.spec index df72087..abc3707 100644 --- a/jameica.spec +++ b/jameica.spec @@ -1,7 +1,7 @@ # # spec file for package jameica # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,6 +40,7 @@ BuildRequires: java-devel >= 11 BuildRequires: jpackage-utils BuildRequires: xml-apis Requires: java >= 11 +Requires: libgthread-2_0-0 %ifarch %{ix86} ppc s390 %global bits 32 -- 2.51.1 From 0d72e49eb3f9b26908456d0a251c0766f5739cf8de8955eef5cd580110e8571d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 5 Feb 2025 07:00:54 +0000 Subject: [PATCH 2/7] fix build OBS-URL: https://build.opensuse.org/package/show/Java:packages/jameica?expand=0&rev=42 --- jameica.changes | 5 +++++ jameica.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jameica.changes b/jameica.changes index 4965b18..b84fa46 100644 --- a/jameica.changes +++ b/jameica.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 5 07:00:33 UTC 2025 - Fridrich Strba + +- Fix build with recent Factory macro changes + ------------------------------------------------------------------- Thu Jan 16 10:17:35 UTC 2025 - ecsos diff --git a/jameica.spec b/jameica.spec index abc3707..55e6c75 100644 --- a/jameica.spec +++ b/jameica.spec @@ -116,7 +116,7 @@ rm %{buildroot}%{_prefix}/lib/%{name}/jameica-macos64.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-macos-aarch64.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-openbsd.jar -%if %{bits} > 32 +%if "%{bits}" == "64" rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux.jar %ifarch aarch64 armv7l arm64 rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux64.jar -- 2.51.1 From a33f0208ec5690939a6c2aa9ef244289fd02d3cd2307498e9aeb8d13bd5ebb42 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 14 Feb 2025 09:56:26 +0000 Subject: [PATCH 3/7] Accepting request 1245849 from home:ecsos:jameica Update to 2.10.5 OBS-URL: https://build.opensuse.org/request/show/1245849 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jameica?expand=0&rev=44 --- V_2_10_4_BUILD_487.tar.gz | 3 --- V_2_10_5_BUILD_488.tar.gz | 3 +++ jameica.changes | 25 +++++++++++++++++++++++++ jameica.spec | 6 +++--- 4 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 V_2_10_4_BUILD_487.tar.gz create mode 100644 V_2_10_5_BUILD_488.tar.gz diff --git a/V_2_10_4_BUILD_487.tar.gz b/V_2_10_4_BUILD_487.tar.gz deleted file mode 100644 index d415d10..0000000 --- a/V_2_10_4_BUILD_487.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ddc2369c93c45f39c7f3740380e1ed8c99e1eb349c3e006e0baa86db6f69ff7 -size 65276959 diff --git a/V_2_10_5_BUILD_488.tar.gz b/V_2_10_5_BUILD_488.tar.gz new file mode 100644 index 0000000..c9f1809 --- /dev/null +++ b/V_2_10_5_BUILD_488.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d644cae813faf738993d02fe6d1fffe7d6d4f877909c03ebd20e171b1125f9ba +size 68845767 diff --git a/jameica.changes b/jameica.changes index b84fa46..056041f 100644 --- a/jameica.changes +++ b/jameica.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Feb 14 09:46:49 UTC 2025 - ecsos + +- Update to 2.10.5 + - NEW: 0185 Wir liefern jetzt sowohl MariaDB- als auch MySQL-Treiber mit + - NEW: 0184 Wenn Anwendung im Maximiert-Zustand beendet, dann Fenster-Größe nicht speichern. + Beim Start auch dann Fenster-Größe setzen, wenn im Maximiert-Zustand gestartet wird + - BUG: 0183 Pfad zur Jameica JAR-Datei in jameica-macos-aarch64.sh falsch + - NEW: 0182 Update auf SWT 4.33 für linux64, linux-arm64, win64, macos64, + macos64-aarch64 sowie Java 21 auf win64, macos64, macos64-aarch64 + - NEW: 0181 Nur einen Hintergrund-Task in der GUI zur gleichen Zeit zulassen + - BUG: 0180 Selectboxen wurden nicht farbig hervorgehoben, wenn sie als Pflichtfelder markiert waren + - BUG: 0179 CTRL+A und CTRL+C funktionierte nicht bei Tabellen, die kein Kontextmenü besitzen + - NEW: 0178 Drag'n'Drop-Support für Attachments + - NEW: 0177 Ordner für Dateianhänge kann jetzt auch wieder auf System-Default zurückgesetzt werden. + Außerdem wird der aktuell verwendete Ordner angezeigt + - NEW: 0176 Auf der Startseite einen Hinweis anzeigen, wenn in der letzten Sitzung + Fehler dazu führten, dass kein automatisches Backup erstellt werden konnte + - BUG: 0175 Beim Restore aus dem Systray Fenster forciert in Vordergrund bringen + - NEW: 0174 Wenn Minimieren in Systray aktiviert ist, dann auch beim Klick auf Schliessen-Kreuz + im Fenster-Titel nicht beenden sondern in Systray minimieren + - CHG: 0173 Umstellung des JDBC-Treibers von MySQL auf MariaDB + - CHG: 0172 Rahmen um Slider unter Windows entfernt - das Problem mit der Hintergrundfarbe + existiert in aktuellen Windows-/SWT-Versionen nicht mehr + ------------------------------------------------------------------- Wed Feb 5 07:00:33 UTC 2025 - Fridrich Strba diff --git a/jameica.spec b/jameica.spec index 55e6c75..b49288e 100644 --- a/jameica.spec +++ b/jameica.spec @@ -18,9 +18,9 @@ %define _major 2 %define _minor 10 -%define _micro 4 -%define _build 487 -%define _buildreleases 487 +%define _micro 5 +%define _build 488 +%define _buildreleases 488 %define _version %{_major}.%{_minor}.%{_micro} %define _tag V_%{_major}_%{_minor}_%{_micro}_BUILD_%{_build} -- 2.51.1 From 0a7c75db5898d7ba3e7dce0f6fff696d0791bf459eba39b6045ff0fef8c8125d Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 14 Feb 2025 15:08:07 +0000 Subject: [PATCH 4/7] Accepting request 1245908 from home:ecsos:jameica Update to 2.10 5 OBS-URL: https://build.opensuse.org/request/show/1245908 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jameica?expand=0&rev=45 --- jameica.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jameica.spec b/jameica.spec index b49288e..8c395f9 100644 --- a/jameica.spec +++ b/jameica.spec @@ -36,10 +36,10 @@ BuildArch: noarch BuildRequires: ant BuildRequires: dos2unix BuildRequires: fdupes -BuildRequires: java-devel >= 11 +BuildRequires: java-devel >= 17 BuildRequires: jpackage-utils BuildRequires: xml-apis -Requires: java >= 11 +Requires: java >= 17 Requires: libgthread-2_0-0 %ifarch %{ix86} ppc s390 -- 2.51.1 From 5dbaae97a051bd25afefb7cc5f4fd06209b3e5fca53293b6986b847e630ffd07 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Wed, 19 Feb 2025 09:05:19 +0000 Subject: [PATCH 5/7] Accepting request 1246968 from home:ecsos:jameica Fix boo#1237326 OBS-URL: https://build.opensuse.org/request/show/1246968 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jameica?expand=0&rev=47 --- jameica-rpmlintrc | 2 ++ jameica.changes | 8 ++++++++ jameica.spec | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 jameica-rpmlintrc diff --git a/jameica-rpmlintrc b/jameica-rpmlintrc new file mode 100644 index 0000000..f31c306 --- /dev/null +++ b/jameica-rpmlintrc @@ -0,0 +1,2 @@ +# BuildArch_ noarch can not be set under Tumebleweed. +addFilter("no-binary") diff --git a/jameica.changes b/jameica.changes index 056041f..ae6a977 100644 --- a/jameica.changes +++ b/jameica.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Feb 19 08:33:29 UTC 2025 - ecsos + +- Fix boo#1237326. Jameica can not be start. + Remove BuildArch: noarch and add rpmlintrc file. + If BuildArch is set to noarch, then an arch query no longer seems + to work under Tumbleweed. + ------------------------------------------------------------------- Fri Feb 14 09:46:49 UTC 2025 - ecsos diff --git a/jameica.spec b/jameica.spec index 8c395f9..081ae7f 100644 --- a/jameica.spec +++ b/jameica.spec @@ -32,7 +32,7 @@ License: Apache-2.0 AND GPL-2.0-only AND LGPL-2.0-only AND CPL-1.0 AND Zl Group: Productivity/Office/Finance URL: http://www.willuhn.de/products/jameica/ Source: https://github.com/willuhn/jameica/archive/%{_tag}.tar.gz -BuildArch: noarch +Source99: %{name}-rpmlintrc BuildRequires: ant BuildRequires: dos2unix BuildRequires: fdupes -- 2.51.1 From b5a4bc08ab42a95a2b0c45168882628f06f02a25fce80c3b2aab121b56642199 Mon Sep 17 00:00:00 2001 From: ecsos Date: Wed, 5 Nov 2025 17:25:09 +0100 Subject: [PATCH 6/7] Update to 2.12.0 --- V_2_10_5_BUILD_488.tar.gz | 3 --- jameica.changes | 16 ++++++++++++++ jameica.spec | 44 ++++++++++++++++++++++----------------- 3 files changed, 41 insertions(+), 22 deletions(-) delete mode 100644 V_2_10_5_BUILD_488.tar.gz diff --git a/V_2_10_5_BUILD_488.tar.gz b/V_2_10_5_BUILD_488.tar.gz deleted file mode 100644 index c9f1809..0000000 --- a/V_2_10_5_BUILD_488.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d644cae813faf738993d02fe6d1fffe7d6d4f877909c03ebd20e171b1125f9ba -size 68845767 diff --git a/jameica.changes b/jameica.changes index ae6a977..0e960dc 100644 --- a/jameica.changes +++ b/jameica.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Nov 3 13:23:13 UTC 2025 - ecsos - 2.12.0 + +- Update to 2.12.0 + - CHG: 0192 Support für 32Bit-Windows, 32Bit-Linux und OpenBSD entfernt, Build-Script vereinfacht + - NEW: 0191 Update auf SWT 4.37 für linux64, linux-arm64, win64, macos64, macos64-aarch64 + - BUG: 0190 Das horizontale Skalieren des Hintergrundbildes war falsch - wirkt sich erst in SWT 4.37 aus + - BUG: 0189 Die Bilder für die Zoom-Stufen hatten nicht die selben Seitenverhältnisse + wie das Original-Bild. Führt in SWT 4.37 zu einer SWTException + - NEW: 0188 lib/jakarta_ee/* hinzugefügt + - BUG: 0187 Lock-File nur noch löschen, wenn wir es selbst erzeugt haben + siehe https://homebanking-hilfe.de/forum/topic.php?t=27446 + - NEW: 0186 Erster Code für H2-Migration (mehrere Versionen des H2-Treibers im Classpath, + kann per „migration-h2=true/false“ in de.willuhn.jameica.system.Config.properties umgeschaltet werden + + ------------------------------------------------------------------- Wed Feb 19 08:33:29 UTC 2025 - ecsos diff --git a/jameica.spec b/jameica.spec index 081ae7f..8396eb3 100644 --- a/jameica.spec +++ b/jameica.spec @@ -16,22 +16,24 @@ # -%define _major 2 -%define _minor 10 -%define _micro 5 -%define _build 488 -%define _buildreleases 488 -%define _version %{_major}.%{_minor}.%{_micro} -%define _tag V_%{_major}_%{_minor}_%{_micro}_BUILD_%{_build} +##%%define _major 2 +##%%define _minor 10 +##%%define _micro 5 +##%%define _build 488 +##%%define _buildreleases 488 +##%%define _version %%{_major}.%%{_minor}.%%{_micro} +##%%define _tag V_%%{_major}_%%{_minor}_%%{_micro}_BUILD_%%{_build} Name: jameica -Version: %{_version} +##Version: 448%%{_version} +Version: 2.12.0 Release: 0 Summary: Runtime environment for Java applications like Hibiscus License: Apache-2.0 AND GPL-2.0-only AND LGPL-2.0-only AND CPL-1.0 AND Zlib AND MPL-1.0 AND EPL-1.0 Group: Productivity/Office/Finance URL: http://www.willuhn.de/products/jameica/ -Source: https://github.com/willuhn/jameica/archive/%{_tag}.tar.gz +##Source: https://github.com/willuhn/jameica/archive/%%{_tag}.tar.gz +Source: %{name}-%{version}.tar.gz Source99: %{name}-rpmlintrc BuildRequires: ant BuildRequires: dos2unix @@ -78,19 +80,21 @@ BuildArch: noarch Developer documentation for Jameica. %prep -%setup -q -n %{name}-%{_tag} +##%%setup -q -n %%{name}-%%{_tag} +%setup -q -n %{name}-%{version} # rpmlint find . -type f -name '*.txt' -exec chmod -x {} \; find . -type f -name '*.html' -exec chmod -x {} \; find . -type f -name '*.properties' -exec chmod -x {} \; -rm build/jameica-win32.exe +##rm build/jameica-win32.exe +##rm build/launch4j-win32.xml +##rm build/jameica-openbsd.sh rm build/jameica-win64.exe -rm build/launch4j-win32.xml -rm build/launch4j-win64.xml rm build/jameica-macos64.sh rm build/jameica-macos-aarch64.sh -rm build/jameica-openbsd.sh +rm build/launch4j-win64.xml + rm -rf lib/swt/macos64 rm -rf lib/swt/macos-aarch64 @@ -105,19 +109,20 @@ ant -f build/build.xml init compile jar zip src javadoc %install mkdir -p %{buildroot}%{_prefix}/lib/jameica/plugins -cp -r releases/%{version}-%{_buildreleases}/%{name} %{buildroot}%{_prefix}/lib +##cp -r releases/%%{version}-%%{_buildreleases}/%%{name} %%{buildroot}%%{_prefix}/lib +cp -r releases/%{version}/%{name} %{buildroot}%{_prefix}/lib chmod +x %{buildroot}%{_prefix}/lib/%{name}/rcjameica chmod +x %{buildroot}%{_prefix}/lib/%{name}/jameicaserver.sh chmod +x %{buildroot}%{_prefix}/lib/%{name}/jameica.sh -rm %{buildroot}%{_prefix}/lib/%{name}/jameica-win32.jar +##rm %%{buildroot}%%{_prefix}/lib/%%{name}/jameica-win32.jar +##rm %%{buildroot}%%{_prefix}/lib/%%{name}/jameica-openbsd.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-win64.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-macos64.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-macos-aarch64.jar -rm %{buildroot}%{_prefix}/lib/%{name}/jameica-openbsd.jar %if "%{bits}" == "64" -rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux.jar + ##rm %%{buildroot}%%{_prefix}/lib/%%{name}/jameica-linux.jar %ifarch aarch64 armv7l arm64 rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux64.jar %else @@ -138,7 +143,8 @@ ln -sf %{_prefix}/lib/%{name}/jameicaserver.sh %{buildroot}%{_bindir}/jameicaser cp -r src %{buildroot}%{_prefix}/lib/jameica mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -r releases/%{version}-%{_buildreleases}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +##cp -r releases/%%{version}-%%{_buildreleases}/javadoc/* %%{buildroot}%%{_javadocdir}/%%{name}-%%{version} +cp -r releases/%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} %fdupes %{buildroot}%{_prefix}/lib/%{name} -- 2.51.1 From 20e69aecd20bb3ed969367e24e1f2eb5a9b1ffef5cd326bbf847df4f97df68d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= Date: Thu, 6 Nov 2025 08:22:38 +0100 Subject: [PATCH 7/7] Fix build + cleanup --- 2.12.0.tar.gz | 3 +++ jameica.spec | 51 +++++++++++++++++++-------------------------------- 2 files changed, 22 insertions(+), 32 deletions(-) create mode 100644 2.12.0.tar.gz diff --git a/2.12.0.tar.gz b/2.12.0.tar.gz new file mode 100644 index 0000000..96830ac --- /dev/null +++ b/2.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd809405c1913c43ce15a89de510cb4a97f7af59d59916d57eb83149d0067047 +size 70984922 diff --git a/jameica.spec b/jameica.spec index 8396eb3..ce2e78c 100644 --- a/jameica.spec +++ b/jameica.spec @@ -1,7 +1,7 @@ # # spec file for package jameica # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,34 +16,6 @@ # -##%%define _major 2 -##%%define _minor 10 -##%%define _micro 5 -##%%define _build 488 -##%%define _buildreleases 488 -##%%define _version %%{_major}.%%{_minor}.%%{_micro} -##%%define _tag V_%%{_major}_%%{_minor}_%%{_micro}_BUILD_%%{_build} - -Name: jameica -##Version: 448%%{_version} -Version: 2.12.0 -Release: 0 -Summary: Runtime environment for Java applications like Hibiscus -License: Apache-2.0 AND GPL-2.0-only AND LGPL-2.0-only AND CPL-1.0 AND Zlib AND MPL-1.0 AND EPL-1.0 -Group: Productivity/Office/Finance -URL: http://www.willuhn.de/products/jameica/ -##Source: https://github.com/willuhn/jameica/archive/%%{_tag}.tar.gz -Source: %{name}-%{version}.tar.gz -Source99: %{name}-rpmlintrc -BuildRequires: ant -BuildRequires: dos2unix -BuildRequires: fdupes -BuildRequires: java-devel >= 17 -BuildRequires: jpackage-utils -BuildRequires: xml-apis -Requires: java >= 17 -Requires: libgthread-2_0-0 - %ifarch %{ix86} ppc s390 %global bits 32 %endif @@ -53,6 +25,23 @@ Requires: libgthread-2_0-0 %if 0%{?__isa_bits} %global bits %{__isa_bits} %endif +Name: jameica +Version: 2.12.0 +Release: 0 +Summary: Runtime environment for Java applications like Hibiscus +License: Apache-2.0 AND GPL-2.0-only AND LGPL-2.0-only AND CPL-1.0 AND Zlib AND MPL-1.0 AND EPL-1.0 +Group: Productivity/Office/Finance +URL: https://www.willuhn.de/products/jameica/ +Source: https://github.com/willuhn/jameica/archive/refs/tags/%{version}.tar.gz +Source99: %{name}-rpmlintrc +BuildRequires: ant +BuildRequires: dos2unix +BuildRequires: fdupes +BuildRequires: java-devel >= 17 +BuildRequires: jpackage-utils +BuildRequires: xml-apis +Requires: java >= 17 +Requires: libgthread-2_0-0 %description Serves as a base framework for recurring tasks on Hibiscus. @@ -80,8 +69,7 @@ BuildArch: noarch Developer documentation for Jameica. %prep -##%%setup -q -n %%{name}-%%{_tag} -%setup -q -n %{name}-%{version} +%setup -q # rpmlint find . -type f -name '*.txt' -exec chmod -x {} \; find . -type f -name '*.html' -exec chmod -x {} \; @@ -95,7 +83,6 @@ rm build/jameica-macos64.sh rm build/jameica-macos-aarch64.sh rm build/launch4j-win64.xml - rm -rf lib/swt/macos64 rm -rf lib/swt/macos-aarch64 rm -rf lib/swt/win32 -- 2.51.1