Hello community, here is the log from the commit of package scim-bridge for openSUSE:Factory checked in at 2017-08-08 11:59:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-bridge (Old) and /work/SRC/openSUSE:Factory/.scim-bridge.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-bridge" Tue Aug 8 11:59:30 2017 rev:49 rq:514901 version:0.4.17 Changes: -------- --- /work/SRC/openSUSE:Factory/scim-bridge/scim-bridge.changes 2015-09-30 05:51:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-bridge.new/scim-bridge.changes 2017-08-08 11:59:34.241225813 +0200 @@ -1,0 +2,13 @@ +Mon Aug 7 05:51:27 UTC 2017 - [email protected] + +- update version 0.4.17 + * collected fixes from openSUSE/Fedora/Gentoo +- upstreamed patches: + * bug-351920-should-return-retval.patch + * scim-bridge-0.4.15-gcc44.patch + * scim-bridge-fix-vnc-display-check.diff + * scim-bridge-gcc47.patch + * scim-bridge-reregister-type-module-if-reload.patch +- upstreamed source: scim-bridge.1 + +------------------------------------------------------------------- Old: ---- bug-351920-should-return-retval.patch scim-bridge-0.4.15-gcc44.patch scim-bridge-0.4.16.tar.bz2 scim-bridge-fix-vnc-display-check.diff scim-bridge-gcc47.patch scim-bridge-reregister-type-module-if-reload.patch scim-bridge.1 New: ---- scim-bridge-0.4.17.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-bridge.spec ++++++ --- /var/tmp/diff_new_pack.8EiRU6/_old 2017-08-08 11:59:35.185092875 +0200 +++ /var/tmp/diff_new_pack.8EiRU6/_new 2017-08-08 11:59:35.189092312 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-bridge # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,34 +17,24 @@ Name: scim-bridge -Version: 0.4.16 +Version: 0.4.17 Release: 0 Summary: Yet another IM client of SCIM License: LGPL-2.1+ Group: System/I18n/Japanese Url: https://github.com/scim-im -# CVS repository: -# cvs -d:pserver:[email protected]:/cvsroot/scim login -# cvs -z3 -d:pserver:[email protected]:/cvsroot/scim co scim-bridge -Source: %{name}-%{version}.tar.bz2 +Source: https://github.com/scim-im/scim-bridge/archive/v%{version}/%{name}-%{version}.tar.gz Source1: xim.d-%{name} -Source2: %{name}.1 Source99: baselibs.conf -Patch3: bug-351920-should-return-retval.patch -Patch8: scim-bridge-0.4.15-gcc44.patch -Patch9: scim-bridge-fix-vnc-display-check.diff -Patch10: scim-bridge-reregister-type-module-if-reload.patch -Patch11: scim-bridge-gcc47.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: doxygen BuildRequires: gtk2-devel BuildRequires: libqt4-devel BuildRequires: libtool BuildRequires: scim-devel -Provides: scim-bridge-agent Recommends: scim-bridge-gtk2 = %{version} Recommends: scim-bridge-qt4 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: scim-bridge-agent %description Yet another IM client of SCIM. The immodules of scim-bridge @@ -59,11 +49,11 @@ Summary: Scim-bridge immodule for GTK+ 2.0 Group: System/I18n/Japanese Requires: %{name} = %{version} +Supplements: packageand(scim-bridge:gtk2) Provides: scim-bridge-client-gtk Provides: scim-bridge-gtk = %{version} Obsoletes: scim-bridge-gtk <= %{version} -Supplements: packageand(scim-bridge:gtk2) -%{scim_gtk2_immodule_requires} +%scim_gtk2_immodule_requires %description gtk2 Scim-bridge-gtk2 is the gtk+-2.0 client of scim-bridge, it provides @@ -73,22 +63,18 @@ Summary: Scim-bridge immodule for Qt4 Group: System/I18n/Japanese Requires: %{name} = %{version} +Supplements: packageand(scim-bridge:libqt4) Provides: scim-bridge-client-qt4 Provides: scim-bridge-qt = %{version} Obsoletes: scim-bridge-qt <= %{version} -Supplements: packageand(scim-bridge:libqt4) %description qt4 Scim-bridge-qt4 is the qt4 client of scim-bridge, it provides another qt-immodule for SCIM. %prep -%setup -q -n %{name}-%{version} -%patch3 -p1 -%patch8 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 +%setup -q +./bootstrap %build export CFLAGS="%{optflags}" @@ -105,8 +91,8 @@ make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} -find %{buildroot} -name "*.la" -delete -print +%make_install +find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xim.d/%{name} @@ -127,25 +113,25 @@ # fix path mkdir -p %{buildroot}%{_libdir}/qt4/plugins/inputmethods -mv %{buildroot}%{_prefix}/plugins/inputmethods/*.so %{buildroot}%{_libdir}/qt4/plugins/inputmethods/ -rm -rf %{buildroot}%{_prefix}/plugins +mv %{buildroot}%{_libdir}/plugins/inputmethods/*.so %{buildroot}%{_libdir}/qt4/plugins/inputmethods/ +rm -rf %{buildroot}%{_libdir}/plugins mkdir -p %{buildroot}%{_libdir}/gtk-2.0/2.10.0/immodules mv %{buildroot}%{_libdir}/gtk-2.0/immodules/*.so %{buildroot}%{_libdir}/gtk-2.0/2.10.0/immodules/ rm -rf %{buildroot}%{_libdir}/gtk-2.0/immodules # install manpage mkdir -p %{buildroot}%{_mandir}/man1 -install -m 644 %{SOURCE2} %{buildroot}%{_mandir}/man1/ +install -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/ rm doc/Makefile* %post gtk2 /sbin/ldconfig -%{scim_gtk2_immodule_post} +%scim_gtk2_immodule_post %postun gtk2 /sbin/ldconfig -%{scim_gtk2_immodule_postun} +%scim_gtk2_immodule_postun %post qt4 -p /sbin/ldconfig %postun qt4 -p /sbin/ldconfig @@ -153,7 +139,6 @@ %postun -p /sbin/ldconfig %files -%defattr(-, root, root) %doc AUTHORS COPYING ChangeLog doc %dir %{_sysconfdir}/X11/xim.d/ %config %{_sysconfdir}/X11/xim.d/* @@ -161,11 +146,9 @@ %{_mandir}/man1/%{name}.1%{ext_man} %files gtk2 -%defattr(-, root, root) %{_libdir}/gtk-2.0/2.10.0/immodules/im-%{name}.so %files qt4 -%defattr(-, root, root) %{_libdir}/qt4/plugins/inputmethods/im-%{name}.so %changelog
