Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2016-06-19 10:42:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin" Changes: -------- --- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2015-10-28 17:30:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2016-06-19 10:42:18.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Jun 8 01:47:55 UTC 2016 - [email protected] + +- fix tumbleweed build +- refresh patch: gcin-improve-build-with-pkgconfig.patch + * Qt5PlatformSupport has gone from Qt 5.6.0 + * fix include for qinputmethod.h +- add gcin-qt5 to baselibs.conf +- rename the sub-packages in openSUSE style +- split libgcin-im-client1 library + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.HpsxMV/_old 2016-06-19 10:42:20.000000000 +0200 +++ /var/tmp/diff_new_pack.HpsxMV/_new 2016-06-19 10:42:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gcin # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -65,19 +65,18 @@ %endif %endif Requires: %{name}-branding -Requires: %{name}-gtk2-immodule = %{version} -Requires: %{name}-qt4-immodule = %{version} +Requires: %{name}-gtk2 = %{version} +Requires: %{name}-qt4 = %{version} +Requires: libgcin-im-client1 = %{version} Recommends: libreoffice-gnome Provides: locale(zh_TW;zh_HK;zh_MO) BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1130 BuildRequires: gtk3-devel +Requires: %{name}-gtk3 = %{version} %endif -%if 0%{?suse_version} > 1130 -Requires: %{name}-gtk3-immodule = %{version} -%endif -%if 0%{?suse_version} > 1310 -Requires: %{name}-qt5-immodule = %{version} +%if 0%{?suse_version} >= 1310 +Requires: %{name}-qt5 = %{version} %endif %if 0%{?suse_version} > 1315 Requires: libappindicator3-1 @@ -103,54 +102,72 @@ %description branding-upstream This package provides upstream look and feel for gcin -%package gtk2-immodule +%package -n libgcin-im-client1 +Summary: Share libraries of gcin +License: LGPL-2.1 +Group: System/Libraries + +%description -n libgcin-im-client1 +This package provides runtime libraries for gcin. + +%package gtk2 Summary: Gcin gtk2 immodule License: LGPL-2.1 Group: System/I18n/Chinese Requires: %{name} = %{version} +Provides: %{name}-gtk2-immodule = %{version} +Obsoletes: %{name}-gtk2-immodule <= 2.8.4-77.16 %{gtk2_immodule_requires} -%description gtk2-immodule +%description gtk2 gcin gtk2 immodule, support gtk2-based applications -%package qt4-immodule +%package qt4 Summary: Gcin qt4 immodule License: GPL-2.0 Group: System/I18n/Chinese Requires: %{name} = %{version} +Provides: %{name}-qt4-immodule = %{version} +Obsoletes: %{name}-qt4-immodule <= 2.8.4-77.16 -%description qt4-immodule +%description qt4 gcin qt4 immodule, support Qt4-based applications -%if 0%{?suse_version} > 1310 -%package qt5-immodule +%if 0%{?suse_version} >= 1310 +%package qt5 Summary: Gcin qt5 immodule License: GPL-2.0 Group: System/I18n/Chinese Requires: %{name} = %{version} +Provides: %{name}-qt5-immodule = %{version} +Obsoletes: %{name}-qt5-immodule <= 2.8.4-77.16 -%description qt5-immodule +%description qt5 gcin qt5 immodule, support Qt5-based applications %endif -%package anthy-module +%package anthy Summary: Gcin anthy module License: LGPL-2.1 -Group: System/I18n/Chinese +Group: System/I18n/Japanese Requires: %{name} = %{version} +Provides: %{name}-anthy-module = %{version} +Obsoletes: %{name}-anthy-module <= 2.8.4-77.16 -%description anthy-module +%description anthy gcin anthy module, try this to input Japanese with libanthy %if 0%{?suse_version} > 1130 -%package gtk3-immodule +%package gtk3 Summary: Gcin gtk3 immodule License: LGPL-2.1 Group: System/I18n/Chinese Requires: %{name} = %{version} +Provides: %{name}-gtk3-immodule = %{version} +Obsoletes: %{name}-gtk3-immodule <= 2.8.4-77.16 %{gtk3_immodule_requires} -%description gtk3-immodule +%description gtk3 gcin gtk3 immodule, support gtk3-based applications %endif @@ -203,24 +220,24 @@ %find_lang %{name} %fdupes %{buildroot} -%post -p /sbin/ldconfig +%post -n libgcin-im-client1 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libgcin-im-client1 -p /sbin/ldconfig -%post anthy-module -p /sbin/ldconfig +%post anthy -p /sbin/ldconfig -%postun anthy-module -p /sbin/ldconfig +%postun anthy -p /sbin/ldconfig -%post gtk2-immodule +%post gtk2 /sbin/ldconfig %{gtk2_immodule_post} -%postun gtk2-immodule +%postun gtk2 /sbin/ldconfig %{gtk2_immodule_postun} %if 0%{?suse_version} > 1130 -%post gtk3-immodule +%post gtk3 /sbin/ldconfig #Add icons to gnome3 panel TARGET="%{_datadir}/gnome-shell/js/ui/statusIconDispatcher.js" @@ -234,47 +251,62 @@ %{gtk3_immodule_post} -%postun gtk3-immodule +%postun gtk3 /sbin/ldconfig %{gtk3_immodule_postun} %endif +%post qt4 -p /sbin/ldconfig +%postun qt4 -p /sbin/ldconfig +%if 0%{?suse_version} >= 1310 +%post qt5 -p /sbin/ldconfig +%postun qt5 -p /sbin/ldconfig +%endif + %files -f %{name}.lang %defattr(-,root,root) %doc README.html Changelog.html COPYING AUTHORS gcin-README.suse xim.gcin.suse.template %config %{_sysconfdir}/X11/xim.d/ %{_bindir}/* -%{_libdir}/gcin/ %{_datadir}/gcin/ %{_datadir}/pixmaps/gcin.png %{_datadir}/applications/* -%exclude %{_libdir}/gcin/anthy-module.so %dir %{_datadir}/icons/gcin/ +%files -n libgcin-im-client1 +%defattr(-,root,root) +%dir %{_libdir}/gcin +%{_libdir}/gcin/libgcin-im-client.so +%{_libdir}/gcin/libgcin-im-client.so.1 +%{_libdir}/gcin/libgcin-im-client.so.1.2.5 +%{_libdir}/gcin/gcin1.so +%{_libdir}/gcin/gcin2.so +%{_libdir}/gcin/intcode-module.so + %files branding-upstream %defattr(-,root,root) %{_datadir}/icons/gcin/* -%files gtk2-immodule +%files gtk2 %defattr(-,root,root) %{_libdir}/gtk-2.0/2.10.0/immodules/im-gcin.so -%files qt4-immodule +%files qt4 %defattr(-,root,root) %{_libdir}/qt4/plugins/inputmethods/im-gcin.so -%if 0%{?suse_version} > 1310 -%files qt5-immodule +%if 0%{?suse_version} >= 1310 +%files qt5 %defattr(-,root,root) %{_libdir}/qt5/plugins/platforminputcontexts/libgcinplatforminputcontextplugin.so %endif -%files anthy-module +%files anthy %defattr(-,root,root) %{_libdir}/gcin/anthy-module.so %if 0%{?suse_version} > 1130 -%files gtk3-immodule +%files gtk3 %defattr(-,root,root) %{_libdir}/gtk-3.0/3.0.0/immodules/im-gcin.so %endif ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.HpsxMV/_old 2016-06-19 10:42:20.000000000 +0200 +++ /var/tmp/diff_new_pack.HpsxMV/_new 2016-06-19 10:42:20.000000000 +0200 @@ -1,24 +1,41 @@ gcin requires "gcin-branding" - requires "gcin-gtk2-immodule-<targettype> = <version>" - requires "gcin-qt4-immodule-<targettype> = <version>" - recommends "gcin-gtk3-immodule-<targettype> = <version>" - recommends "libreoffice-gnome" - post "/sbin/ldconfig" - postun "/sbin/ldconfig" -gcin-gtk2-immodule + requires "libgcin-im-client1-<targettype> = <version>" + requires "gcin-gtk2-<targettype> = <version>" + requires "gcin-gtk3-<targettype> = <version>" + requires "gcin-qt4-<targettype> = <version>" + requires "gcin-qt5-<targettype> = <version>" + recommends "libreoffice-gnome" + post "/sbin/ldconfig" + postun "/sbin/ldconfig" +libgcin-im-client1 + post "/sbin/ldconfig" + postun "/sbin/ldconfig" +gcin-gtk2 + requires "gcin-<targettype> = <version>" + provides "gcin-gtk2-immodule-<targettype> = <version>" + obsoletes "gcin-gtk2-immodule-<targettype> <= 2.8.4-77.16" + post "/sbin/ldconfig" + post "%gtk2_immodule_post" + postun "/sbin/ldconfig" + postun "%gtk2_immodule_postun" +gcin-gtk3 requires "gcin-<targettype> = <version>" + provides "gcin-gtk3-immodule-<targettype> = <version>" + obsoletes "gcin-gtk3-immodule-<targettype> <= 2.8.4-77.16" post "/sbin/ldconfig" - post "%gtk2_immodule_post" - postun "/sbin/ldconfig" - postun "%gtk2_immodule_postun" -gcin-gtk3-immodule + post "%gtk3_immodule_post" + postun "/sbin/ldconfig" + postun "%gtk3_immodule_postun" +gcin-qt4 requires "gcin-<targettype> = <version>" + provides "gcin-qt4-immodule-<targettype> = <version>" + obsoletes "gcin-qt4-immodule-<targettype> <= 2.8.4-77.16" post "/sbin/ldconfig" - post "%gtk3_immodule_post" - postun "/sbin/ldconfig" - postun "%gtk3_immodule_postun" -gcin-qt4-immodule + postun "/sbin/ldconfig" +gcin-qt5 requires "gcin-<targettype> = <version>" + provides "gcin-qt5-immodule-<targettype> = <version>" + obsoletes "gcin-qt5-immodule-<targettype> <= 2.8.4-77.16" post "/sbin/ldconfig" postun "/sbin/ldconfig" ++++++ gcin-improve-build-with-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.HpsxMV/_old 2016-06-19 10:42:20.000000000 +0200 +++ /var/tmp/diff_new_pack.HpsxMV/_new 2016-06-19 10:42:20.000000000 +0200 @@ -2,21 +2,22 @@ =================================================================== --- a/qt5-im/Makefile +++ b/qt5-im/Makefile -@@ -3,11 +3,10 @@ QT=qt5 +@@ -3,11 +3,11 @@ QT=qt5 QTIM=$(QT)/plugins/platforminputcontexts IMMODULES=$(libdir)/$(DEB_BUILD_MULTIARCH)/$(QTIM) -INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport QtDBus --cflags` -+INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5PlatformSupport Qt5DBus --cflags` ++INCS=-I../im-client -I/usr/include/X11 `pkg-config Qt5Core Qt5Gui Qt5DBus --cflags` # dirty fix for ubuntu 14.04, pkg-config Qt5Gui --cflags return -I/usr/include/qt5/QtGui, missing 5.2.1/QtGui MODVERSION=`pkg-config --modversion Qt5Gui` -INCS+=-I/usr/include/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/i386-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui -INCS+=-I/usr/include/x86_64-linux-gnu/qt5/QtGui/$(MODVERSION)/QtGui +INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui/$(MODVERSION)/QtGui ++INCS+=-I`pkg-config --variable=includedir Qt5Gui`/QtGui CXXFLAGS=$(OPTFLAGS) $(INCS) -Wall -D_REENTRANT -DUNIX=1 -fPIC -DQT5 -DQT_SHARED -DQT_IMMODULE -DPIC -DDEBUG="0$(GCIN_DEBUG)" OBJS= moc_gcin-qt5.o gcin-qt5.o gcin-imcontext-qt5.o moc_qgcinplatforminputcontext.o -@@ -22,10 +21,10 @@ all: $(GCIN_QT5) +@@ -22,10 +22,10 @@ all: $(GCIN_QT5) $(CXX) -E $(CFLAGS) $(INCS) $< > $@ moc_gcin-qt5.cpp: gcin-qt5.h
