Hello community, here is the log from the commit of package scim-hangul for openSUSE:Factory checked in at 2013-01-20 08:23:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-hangul (Old) and /work/SRC/openSUSE:Factory/.scim-hangul.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-hangul", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-hangul/scim-hangul.changes 2012-09-14 12:37:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.scim-hangul.new/scim-hangul.changes 2013-01-20 08:23:43.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Jan 17 05:45:08 UTC 2013 - [email protected] + +- Update to 0.4.0 +- Support GTK+ 3.0 +- Remove skim related codes +- Remove sub-package skim-scim-hangul (upstream remove skim related code) +- Remove build-fix.patch (no skim support) +- Remove gtk-2.12+-gtktooltips-migration.patch missing-includes.patch mkinstalldirs.patch (upstream had fixed them) +- Cleanup spec file + +------------------------------------------------------------------- Old: ---- build-fix.patch gtk-2.12+-gtktooltips-migration.patch missing-includes.patch mkinstalldirs.patch scim-hangul-0.3.2.tar.bz2 New: ---- scim-hangul-0.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-hangul.spec ++++++ --- /var/tmp/diff_new_pack.tEwJVT/_old 2013-01-20 08:23:51.000000000 +0100 +++ /var/tmp/diff_new_pack.tEwJVT/_new 2013-01-20 08:23:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package scim-hangul # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products 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,34 +16,19 @@ # -%define scim_gtk3 1 -%if %suse_version > 1120 -%bcond_with skim -%else -%bcond_without skim -%endif - Name: scim-hangul BuildRequires: gcc-c++ BuildRequires: libhangul-devel +BuildRequires: libstdc++-devel BuildRequires: scim-devel -%if %{with skim} -BuildRequires: kdelibs3-devel -BuildRequires: skim -%endif -Version: 0.3.2 +Version: 0.4.0 Release: 0 -# Provides: locale(scim:ko) Url: http://www.scim-im.org/ # CVS repository: # cvs -d:pserver:[email protected]:/cvsroot/scim login # cvs -z3 -d:pserver:[email protected]:/cvsroot/scim co scim-hangul Source0: http://mesh.dl.sourceforge.net/sourceforge/scim/scim-hangul-%{version}.tar.bz2 -Patch0: build-fix.patch -Patch1: mkinstalldirs.patch -Patch2: missing-includes.patch -Patch3: scim-hangul-gcc47.patch -Patch4: gtk-2.12+-gtktooltips-migration.patch +Patch0: scim-hangul-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Hangul Input Method Engine for SCIM License: GPL-2.0+ @@ -52,32 +37,11 @@ %description Hangul Input Method Engine for SCIM -%if %{with skim} - -%package -n scim-hangul-skim -Summary: skim setup module for scim-hangul -Group: System/I18n/Korean -Requires: %{name} = %{version} -# Provides: locale(skim:ko) - -%description -n scim-hangul-skim -skim setup module for scim-hangul -%endif - %prep -%define scim_binary_version 1.4.0 +%define scim_binary_version %(pkg-config --variable=scim_binary_version scim) %define build_setup 1 %setup -q -n %{name}-%{version} -%patch0 -p0 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%if 0%{?scim_gtk3} -%patch4 -p1 -%endif -%if %{with skim} -cp skim/admin/mkinstalldirs . -%endif +%patch0 -p1 %build #./bootstrap @@ -85,34 +49,15 @@ #autoreconf -I /opt/gnome/share/aclocal --force --install --verbose export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" -export QTDIR=/usr/lib/qt3 -export KDEDIR=/opt/kde3 %configure --disable-static \ --enable-debug -%if %{with skim} -pushd skim - ./configure --prefix=$KDEDIR -disable-static \ - --enable-debug - popd -%endif make -%if %{with skim} -make -C skim -%endif %install -export QTDIR=/usr/lib/qt3 -export KDEDIR=/opt/kde3 make DESTDIR=${RPM_BUILD_ROOT} install -%if %{with skim} -make -C skim DESTDIR=${RPM_BUILD_ROOT} install -%endif rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/IMEngine/hangul.{a,la} rm -f $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/%{scim_binary_version}/SetupUI/hangul-imengine-setup.{a,la} %find_lang scim-hangul -%if %{with skim} -%find_lang skim-scim-hangul -%endif %clean @@ -129,18 +74,9 @@ %endif %dir %{_datadir}/scim/icons/ %{_datadir}/scim/icons/scim-hangul.png +%{_datadir}/scim/icons/scim-hangul-off.png +%{_datadir}/scim/icons/scim-hangul-on.png %dir %{_datadir}/scim/hangul/ %{_datadir}/scim/hangul/symbol.txt -%if %{with skim} - -%files -n scim-hangul-skim -f skim-scim-hangul.lang -%defattr(-, root, root) -%dir /opt/kde3/share/apps/skim/ -/opt/kde3/share/apps/skim/* -/opt/kde3/share/config.kcfg/* -/opt/kde3/share/services/* -/opt/kde3/%{_lib}/kde3/* -%endif - %changelog ++++++ scim-hangul-0.3.2.tar.bz2 -> scim-hangul-0.4.0.tar.bz2 ++++++ ++++ 205034 lines of diff (skipped) ++++++ scim-hangul-gcc47.patch ++++++ --- /var/tmp/diff_new_pack.tEwJVT/_old 2013-01-20 08:23:52.000000000 +0100 +++ /var/tmp/diff_new_pack.tEwJVT/_new 2013-01-20 08:23:52.000000000 +0100 @@ -1,12 +1,10 @@ -Index: scim-hangul-0.3.2/src/scim_hangul_imengine.cpp -=================================================================== ---- scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp -+++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp +--- scim-hangul-0.4.0-orig/src/scim_hangul_imengine.cpp 2012-07-08 19:16:59.000000000 +0800 ++++ scim-hangul-0.4.0/src/scim_hangul_imengine.cpp 2013-01-17 13:30:38.000000000 +0800 @@ -33,6 +33,7 @@ #include <config.h> #endif +#include <unistd.h> - #include <string.h> + #include <cstring> #include <scim.h> #include "scim_hangul_imengine.h" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
