Hello community, here is the log from the commit of package jameica for openSUSE:Factory checked in at 2020-05-12 22:33:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jameica (Old) and /work/SRC/openSUSE:Factory/.jameica.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jameica" Tue May 12 22:33:58 2020 rev:8 rq:802935 version:2.8.6 Changes: -------- --- /work/SRC/openSUSE:Factory/jameica/jameica.changes 2019-10-21 12:28:20.427956600 +0200 +++ /work/SRC/openSUSE:Factory/.jameica.new.2738/jameica.changes 2020-05-12 22:34:06.524091833 +0200 @@ -1,0 +2,15 @@ +Tue May 12 07:05:52 UTC 2020 - ecsos <[email protected]> + +- Update to 2.8.6 + - DEL: 0126 Support für 32Bit MacOS entfernt + - NEW: 0125 Unterstützung für Linux ARM64 + - NEW: 0124 Bei Win32, Win64 und MacOS64 ist jetzt eine embedded + JRE mit enthalten +- Comment out unbundle eclipse-swt, because it rise up build error. + +------------------------------------------------------------------- +Wed Jan 29 15:11:03 UTC 2020 - Fridrich Strba <[email protected]> + +- Use our own eclipse-swt package to provide swt.jar + +------------------------------------------------------------------- @@ -197 +211,0 @@ - Old: ---- V_2_8_5_BUILD_454.tar.gz New: ---- V_2_8_6_BUILD_455.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jameica.spec ++++++ --- /var/tmp/diff_new_pack.erGsEW/_old 2020-05-12 22:34:08.992096984 +0200 +++ /var/tmp/diff_new_pack.erGsEW/_new 2020-05-12 22:34:08.996096992 +0200 @@ -1,7 +1,7 @@ # # spec file for package jameica # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define _build 454 -%define _buildreleases 454 -%define _tag V_2_8_5_BUILD_%{_build} +%define _build 455 +%define _buildreleases 455 +%define _tag V_2_8_6_BUILD_%{_build} Name: jameica -Version: 2.8.5 +Version: 2.8.6 Release: 0 Summary: Runtime environment for Java applications like Hibiscus License: GPL-2.0-only AND LGPL-2.0-only AND Apache-2.0 AND CPL-1.0 AND Zlib AND MPL-1.0 AND EPL-1.0 @@ -29,6 +29,7 @@ Source: https://github.com/willuhn/jameica/archive/%{_tag}.tar.gz BuildRequires: ant BuildRequires: dos2unix +#BuildRequires: eclipse-swt BuildRequires: fdupes BuildRequires: java-devel >= 1.6 BuildRequires: jpackage-utils @@ -37,11 +38,21 @@ BuildRequires: swtcalendar BuildRequires: velocity = 1.7 BuildRequires: xml-apis +#Requires: eclipse-swt Requires: nanoxml = 2.2.3 Requires: paperclips = 1.0.4 Requires: swtcalendar Requires: velocity = 1.7 -# Don't offer libraries linked in here to other packages: + +%ifarch %{ix86} ppc s390 +%global bits 32 +%endif +%ifarch x86_64 ia64 s390x aarch64 armv7l arm64 +%global bits 64 +%endif +%if 0%{?__isa_bits} +%global bits %{__isa_bits} +%endif %description Serves as a base framework for recurring tasks on Hibiscus. @@ -68,19 +79,23 @@ %prep %setup -q -n %{name}-%{_tag} +# 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-win64.exe rm build/launch4j-win32.xml rm build/launch4j-win64.xml -rm build/jameica-macos.sh rm build/jameica-macos64.sh rm build/jameica-openbsd.sh -rm -rf lib/swt/macos rm -rf lib/swt/macos64 rm -rf lib/swt/win32 rm -rf lib/swt/win64 +# remove arm because of missing ld-linux-aarch64.so.1 package in suse +rm -rf lib/swt/linux-arm64 # unbundle NanoXML rm -rf lib/nanoxml/* @@ -98,6 +113,16 @@ rm -rf lib/velocity/* ln -sf %{_javadir}/velocity.jar lib/velocity/velocity-1.7.jar +# unbundle eclipse-swt +##rm -fr lib/swt/linux*/swt.jar +##%%if %{bits} > 32 +##mkdir -p lib/swt/linux64 +##ln -sf $(find-jar swt) lib/swt/linux64/ +##%%else +##mkdir -p lib/swt/linux +##ln -sf $(find-jar swt) lib/swt/linux/ +##%%endif + %build export CLASSPATH="$(build-classpath xml-apis)" ant -f build/build.xml init compile jar zip src javadoc @@ -111,12 +136,16 @@ rm %{buildroot}%{_prefix}/lib/%{name}/jameica-win32.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-win64.jar -rm %{buildroot}%{_prefix}/lib/%{name}/jameica-macos.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-macos64.jar rm %{buildroot}%{_prefix}/lib/%{name}/jameica-openbsd.jar -%ifarch x86_64 +%if %{bits} > 32 rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux.jar + %ifarch aarch64 armv7l arm64 + rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux64.jar + %else + rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linuxarm64.jar + %endif %else rm %{buildroot}%{_prefix}/lib/%{name}/jameica-linux64.jar %endif ++++++ V_2_8_5_BUILD_454.tar.gz -> V_2_8_6_BUILD_455.tar.gz ++++++ /work/SRC/openSUSE:Factory/jameica/V_2_8_5_BUILD_454.tar.gz /work/SRC/openSUSE:Factory/.jameica.new.2738/V_2_8_6_BUILD_455.tar.gz differ: char 13, line 1
