commit scim-anthy for openSUSE:Factory
Hello community, here is the log from the commit of package scim-anthy for openSUSE:Factory checked in at 2015-09-19 06:54:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-anthy (Old) and /work/SRC/openSUSE:Factory/.scim-anthy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "scim-anthy" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-anthy/scim-anthy.changes 2013-09-26 07:19:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-anthy.new/scim-anthy.changes 2015-09-19 06:54:50.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Sep 13 12:52:31 UTC 2015 - i@marguerite.su + +- remove scim_gtk3 macro, use suse_version instead +- use upstream source +- use macros from macros.scim +- remove unneeded dependency: update-desktop-files + +------------------------------------------------------------------- Old: ---- scim-anthy-1.2.7.tar.bz2 New: ---- scim-anthy-1.2.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-anthy.spec ++++++ --- /var/tmp/diff_new_pack.Hzp65F/_old 2015-09-19 06:54:51.000000000 +0200 +++ /var/tmp/diff_new_pack.Hzp65F/_new 2015-09-19 06:54:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-anthy # -# 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,12 +16,6 @@ # -%if 0%{?suse_version} >= 1140 -%define scim_gtk3 1 -%else -%define scim_gtk3 0 -%endif - Name: scim-anthy Version: 1.2.7 Release: 0 @@ -29,33 +23,30 @@ License: LGPL-2.1+ Group: System/I18n/Japanese Url: http://sourceforge.jp/projects/scim-imengine/ -Source0: scim-anthy-%{version}.tar.bz2 +Source: http://iij.dl.osdn.jp/scim-imengine/37309/%{name}-%{version}.tar.gz Source1: icons.tar.gz Patch3: %{name}-gtk3-abuild.patch -Patch355863: bnc355863-add-Eisu_toggle-to-default-keybindings.patch Patch4: remove-intl.patch +Patch5: bnc355863-add-Eisu_toggle-to-default-keybindings.patch BuildRequires: anthy-devel BuildRequires: gcc-c++ -BuildRequires: gettext-tools BuildRequires: libtool +BuildRequires: pkg-config BuildRequires: scim-devel -BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Anthy 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%{?scim_gtk3} +%patch5 -p1 +%patch4 -p1 +%if 0%{?suse_version} >= 1140 %patch3 -p1 tar -xzvf %{SOURCE1} cp -r icons/* data/ %endif -%patch355863 -p1 -%patch4 -p1 %build libtoolize --force @@ -66,26 +57,19 @@ make %{?_smp_mflags} %install -%makeinstall -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/anthy.{a,la} -rm -f %{buildroot}/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/anthy-imengine-setup.{a,la} -%find_lang scim-anthy +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -name "*.la" -delete -print +%find_lang %{name} -%files -f scim-anthy.lang +%files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING NEWS README ChangeLog -%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/anthy.so -%if %{build_setup} -%dir %{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/ -%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/anthy-imengine-setup.so +%{_scim_enginedir}/anthy.so +%if 0%{?suse_version} >= 1140 +%{_scim_uidir}/anthy-imengine-setup.so +%{_scim_helperdir}/anthy-imengine-helper.so %endif -%{_libdir}/scim-1.0/1.?.?/Helper/anthy-imengine-helper.* -%dir %{_datadir}/scim/icons/ -%{_datadir}/scim/icons/scim-anthy*.png -%dir %{_datadir}/scim/Anthy/ -%{_datadir}/scim/Anthy/* +%{_scim_datadir}/Anthy/ +%{_scim_icondir}/*.png %changelog ++++++ scim-anthy-gtk3-abuild.patch ++++++ ++++ 102263 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/scim-anthy/scim-anthy-gtk3-abuild.patch ++++ and /work/SRC/openSUSE:Factory/.scim-anthy.new/scim-anthy-gtk3-abuild.patch
participants (1)
-
root@hilbert.suse.de