Hello community, here is the log from the commit of package scim-canna for openSUSE:Factory checked in at 2015-09-19 06:54:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-canna (Old) and /work/SRC/openSUSE:Factory/.scim-canna.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-canna" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-canna/scim-canna.changes 2013-07-24 23:40:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-canna.new/scim-canna.changes 2015-09-19 06:54:49.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Sep 13 16:35:13 UTC 2015 - [email protected] + +- drop libtool-autoconf.patch: it's for SLE_10 +- remove other SLE_10 hacks +- use macros from macros.scim +- use %configure +- remove unneeded dependency: update-desktop-files +- remove always enabled macro: scim_gtk3 + +------------------------------------------------------------------- Old: ---- libtool-autoconf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-canna.spec ++++++ --- /var/tmp/diff_new_pack.foythC/_old 2015-09-19 06:54:50.000000000 +0200 +++ /var/tmp/diff_new_pack.foythC/_new 2015-09-19 06:54:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-canna # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -16,7 +16,6 @@ # -%define scim_gtk3 1 Name: scim-canna Version: 1.0.1 Release: 0 @@ -24,58 +23,44 @@ License: GPL-2.0+ Group: System/I18n/Japanese Url: http://sourceforge.jp/projects/scim-imengine/ -Source0: http://iij.dl.sourceforge.jp/scim-imengine/29155/%{name}-%{version}.tar.gz -Patch1: libtool-autoconf.patch +Source: http://iij.dl.sourceforge.jp/scim-imengine/29155/%{name}-%{version}.tar.gz #PATCH-FIX-UPSTREAM migration old gtk functions: gtktooltips -Patch3: gtk-2.12+-gtktooltips-migration.patch +Patch1: gtk-2.12+-gtktooltips-migration.patch #PATCH-FIX-UPSTREAM convert old gtk_combo to new gtk_combobox -Patch4: gtk-2.4+-combobox-migration.patch +Patch2: gtk-2.4+-combobox-migration.patch BuildRequires: canna-devel BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: scim-devel -BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Canna Input Method Engine for SCIM %prep -%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) -%define build_setup 1 %setup -q -%if 0%{?suse_version} <= 1110 %patch1 -p1 -libtoolize --force -autoreconf -I /opt/gnome/share/aclocal --force --install --verbose -%endif -%if 0%{?scim_gtk3} -%patch3 -p1 -%patch4 -p1 -%endif +%patch2 -p1 %build -CXXFLAGS="%{optflags}" \ -./configure --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ +CXXFLAGS="%{optflags}" +%configure \ --disable-static \ --enable-debug -make +make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/canna.{a,la} -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/canna-imengine-setup.{a,la} -%find_lang scim-canna +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.la" -delete -print +%find_lang %{name} -%files -f scim-canna.lang +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/canna.so -%if %{build_setup} -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/canna-imengine-setup.so +%{_scim_enginedir}/canna.so +%if 0%{?suse_version} >= 1140 +%{_scim_uidir}/canna-imengine-setup.so %endif -%{_datadir}/scim/icons/scim-canna.png +%{_scim_icondir}/%{name}.png %changelog
