Hello community, here is the log from the commit of package scim-skk for openSUSE:Factory checked in at 2015-09-24 06:13:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-skk (Old) and /work/SRC/openSUSE:Factory/.scim-skk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-skk" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-skk/scim-skk.changes 2012-09-13 00:06:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-skk.new/scim-skk.changes 2015-09-24 06:13:53.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Sep 16 09:40:00 UTC 2015 - [email protected] + +- remove always enabled macro: scim_gtk3 +- remove SLE_10 hacks + * drop patch libtool-options.patch +- add pkg-config as dependency to fix build of SLE_11_SP3/4 + +------------------------------------------------------------------- Old: ---- libtool-options.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-skk.spec ++++++ --- /var/tmp/diff_new_pack.FcWkBC/_old 2015-09-24 06:13:54.000000000 +0200 +++ /var/tmp/diff_new_pack.FcWkBC/_new 2015-09-24 06:13:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-skk # -# Copyright (c) 2012 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-skk Version: 0.5.2 Release: 0 @@ -26,7 +25,6 @@ Url: http://sourceforge.jp/projects/scim-imengine/ Source0: http://osdn.dl.sourceforge.jp/scim-imengine/15351/scim-skk-0.5.2.tar.bz2 Patch0: commit-when-focus-out.patch -Patch1: libtool-options.patch Patch2: missing-includes.patch Patch3: scim-skk-iter-remove-fix.diff Patch4: scim-skk-fix-returns.diff @@ -34,59 +32,42 @@ Patch5: gtk-2.24+-replace-functions.patch BuildRequires: anthy-devel BuildRequires: gcc-c++ +BuildRequires: pkg-config BuildRequires: scim-devel BuildRequires: update-desktop-files Requires: skkdic -# Provides: locale(scim:ja) BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SKK Input Method Engine for SCIM %prep -%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) -%define build_setup 1 %setup -q %patch0 -p0 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%if 0%{?suse_version} <= 1110 -%patch1 -p0 -libtoolize --force -autoreconf -I /opt/gnome/share/aclocal --force --install --verbose -%endif -%if 0%{?scim_gtk3} %patch5 -p1 -%endif %build CXXFLAGS="%{optflags}" \ -./configure --prefix=/usr \ - --sysconfdir=%{_sysconfdir} \ - --libdir=%{_libdir} \ +%configure \ --disable-static \ --enable-debug -make +make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/skk.{a,la} -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/skk-imengine-setup.{a,la} -%find_lang scim-skk +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.la" -delete -print +%find_lang %{name} -%files -f scim-skk.lang +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README* ChangeLog TODO -%dir %{_libdir}/scim-1.0/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/ -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/ -%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/skk.so -%if %{build_setup} -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/skk-imengine-setup.so +%{_scim_enginedir}/skk.so +%if 0%{?suse_version} >= 1140 +%{_scim_uidir}/skk-imengine-setup.so %endif -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/scim-skk.png +%{_scim_icondir}/scim-skk.png %changelog
