Hello community, here is the log from the commit of package eclipse-swt for openSUSE:Factory checked in at 2019-01-24 14:13:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/eclipse-swt (Old) and /work/SRC/openSUSE:Factory/.eclipse-swt.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eclipse-swt" Thu Jan 24 14:13:01 2019 rev:26 rq:667727 version:4.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/eclipse-swt/eclipse-swt.changes 2018-05-23 16:08:49.782580033 +0200 +++ /work/SRC/openSUSE:Factory/.eclipse-swt.new.28833/eclipse-swt.changes 2019-01-24 14:13:02.611388200 +0100 @@ -1,0 +2,12 @@ +Tue Jan 15 15:27:23 UTC 2019 - Fridrich Strba <[email protected]> + +- Downgrade to 4.3.1 + * the corresponding eclipse version instead of using the libswt + version, since that is what the upstream versions look like +- Add back the libgnomeui-devel because the gnome-gtk library is + not built without it +- Simplify the spec file by removing conditions for old SUSE + versions +- Run spec-cleaner + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ eclipse-swt.spec ++++++ --- /var/tmp/diff_new_pack.PFSGge/_old 2019-01-24 14:13:03.143387585 +0100 +++ /var/tmp/diff_new_pack.PFSGge/_new 2019-01-24 14:13:03.147387582 +0100 @@ -1,7 +1,7 @@ # # spec file for package eclipse-swt # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{!?aarch64:%global aarch64 aarch64 arm64 armv8} %define version_suffix 4.3.3.3 %define so_suffix 4333 +%define libswt_version 4.333 Name: eclipse-swt -Version: 4.333 +Version: 4.3.1 Release: 0 Summary: SWT Library for GTK2 License: EPL-1.0 Group: Development/Libraries/Other -Url: http://www.eclipse.org/swt/ -Source0: libswt-%{version}.tar.bz2 -Source1: org.eclipse.swt-4.3.1.tar.bz2 +URL: http://www.eclipse.org/swt/ +Source0: libswt-%{libswt_version}.tar.bz2 +Source1: org.eclipse.swt-%{version}.tar.bz2 Source2: build.xml Patch0: libswt-optflags.patch Patch1: libswt-includes.patch @@ -47,26 +48,17 @@ BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: java-devel >= 1.8 -BuildRequires: jpackage-utils +BuildRequires: javapackages-tools +BuildRequires: libXt-devel +BuildRequires: libXtst-devel BuildRequires: libgnome-devel +BuildRequires: libgnomeui-devel BuildRequires: make BuildRequires: mozilla-nspr-devel BuildRequires: pkgconfig -BuildRequires: unzip -BuildRequires: zip BuildRequires: pkgconfig(glu) Requires: java >= 1.8 Provides: libswt3-gtk2 = %{version} -%if 0%{?suse_version} <= 1210 -Requires: mozilla-xulrunner192 -%endif -%if 0%{?suse_version} <= 1210 -BuildRequires: libxslt -BuildRequires: mozilla-xulrunner192-devel -%else -BuildRequires: libXt-devel -BuildRequires: libXtst-devel -%endif %description SWT is the software component that delivers native widget functionality @@ -75,7 +67,7 @@ set of native widgets. %prep -%setup -q -n libswt-%{version} +%setup -q -n libswt-%{libswt_version} %patch0 %patch1 %patch2 @@ -124,64 +116,26 @@ build.jars rm build.xml popd -zip -u org/eclipse/swt/swt-%{version}.jar *.so +jar uf org/eclipse/swt/swt-%{version}.jar *.so %install install -d -m755 %{buildroot}%{_libdir}/eclipse install -m644 *.so %{buildroot}%{_libdir}/eclipse -install -D -m644 org/eclipse/swt/swt-%{version}.jar %{buildroot}%{_libdir}/java/swt-gtk-%{version}.jar +install -D -m644 org/eclipse/swt/swt-%{version}.jar %{buildroot}%{_jnidir}/swt-gtk-%{version}.jar pushd %{buildroot}%{_libdir}/eclipse -%if 0%{?suse_version} < 1210 -for i in atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk mozilla-gtk pi-gtk webkit-gtk; do - ln -sf libswt-"$i"-%{so_suffix}.so libswt-"$i".so; - ln -sf libswt-"$i"-%{so_suffix}.so swt-"$i".so; -done -%else -# Drop mozilla-gtk in openSUSE 12.2 because of not existing mozilla-xulrunner192-devel -for i in atk-gtk awt-gtk cairo-gtk glx-gtk gnome-gtk gtk pi-gtk webkit-gtk; do + for i in atk-gtk awt-gtk cairo-gtk glx-gtk gtk gnome-gtk pi-gtk webkit-gtk; do ln -sf libswt-"$i"-%{so_suffix}.so libswt-"$i".so; ln -sf libswt-"$i"-%{so_suffix}.so swt-"$i".so; -done -%endif + done popd -pushd %{buildroot}%{_libdir}/java -ln -sf swt-gtk-%{version}.jar swt.jar -ln -sf swt-gtk-%{version}.jar swt-gtk.jar +pushd %{buildroot}%{_jnidir} + ln -sf swt-gtk-%{version}.jar swt.jar + ln -sf swt-gtk-%{version}.jar swt-gtk.jar popd %files -%{_libdir}/eclipse/libswt-atk-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-atk-gtk.so -%{_libdir}/eclipse/swt-atk-gtk.so -%{_libdir}/eclipse/libswt-awt-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-awt-gtk.so -%{_libdir}/eclipse/swt-awt-gtk.so -%{_libdir}/eclipse/libswt-cairo-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-cairo-gtk.so -%{_libdir}/eclipse/swt-cairo-gtk.so -%{_libdir}/eclipse/libswt-glx-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-glx-gtk.so -%{_libdir}/eclipse/swt-glx-gtk.so -%{_libdir}/eclipse/libswt-gnome-gtk.so -%{_libdir}/eclipse/swt-gnome-gtk.so -%{_libdir}/eclipse/libswt-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-gtk.so -%{_libdir}/eclipse/swt-gtk.so -%if 0%{?suse_version} < 1210 -%{_libdir}/eclipse/libswt-mozilla-gtk.so -%{_libdir}/eclipse/swt-mozilla-gtk.so -%endif -%{_libdir}/eclipse/libswt-pi-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-pi-gtk.so -%{_libdir}/eclipse/swt-pi-gtk.so -%{_libdir}/eclipse/libswt-webkit-gtk-%{so_suffix}.so -%{_libdir}/eclipse/libswt-webkit-gtk.so -%{_libdir}/eclipse/swt-webkit-gtk.so -%{_libdir}/java/swt.jar -%{_libdir}/java/swt-gtk.jar -%{_libdir}/java/swt-gtk-%{version}.jar +%{_libdir}/eclipse +%{_jnidir} %doc about_files/* -%dir %{_libdir}/eclipse -%dir %{_libdir}/java %changelog
