Hello community,
here is the log from the commit of package imhangul for openSUSE:Factory checked in at 2015-08-27 08:57:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/imhangul (Old)
and /work/SRC/openSUSE:Factory/.imhangul.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "imhangul"
Changes:
--------
--- /work/SRC/openSUSE:Factory/imhangul/imhangul.changes 2011-09-23 02:03:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.imhangul.new/imhangul.changes 2015-08-27 08:57:30.000000000 +0200
@@ -1,0 +2,10 @@
+Tue Aug 25 03:06:55 UTC 2015 - opensuse-packaging@opensuse.org
+
+- update to version 3.1.1+git20130112.a4c2796
+ * see NEWS (Korean)
+- drop imhangul-0.9.14-gtk-deprecated.patch, upstreamed
+- add deprecated-gtk3.14.patch
+ * don't use deprecated gtk_alignment_new() and
+ gtk_alignment_set_padding() functions
+
+-------------------------------------------------------------------
Old:
----
imhangul-0.9.14-gtk-deprecated.patch
imhangul-0.9.14.tar.bz2
New:
----
_service
_servicedata
deprecated-gtk3.14.patch
imhangul-3.1.1+git20130112.a4c2796.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ imhangul.spec ++++++
--- /var/tmp/diff_new_pack.fgCABx/_old 2015-08-27 08:57:30.000000000 +0200
+++ /var/tmp/diff_new_pack.fgCABx/_new 2015-08-27 08:57:30.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package imhangul
#
-# Copyright (c) 2011 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
@@ -15,71 +15,61 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: imhangul
-BuildRequires: gtk2-devel libhangul-devel update-desktop-files
-%define prefix /usr
-%define sysconfdir /etc
+Version: 3.1.1+git20130112.a4c2796
+Release: 0
+Summary: GTK+-3.0 Hangul Input Modules
License: GPL-2.0+
Group: System/I18n/Korean
-AutoReqProv: on
-Provides: locale(gtk2:ko)
-PreReq: /usr/bin/touch
-Requires: gtk2
-Version: 0.9.14
-Release: 15
-Url: http://imhangul.kldp.net/
-Source0: http://kldp.net/download.php/1443/imhangul-%{version}.tar.bz2
+Url: https://github.com/choehwanjin/imhangul
+Source: imhangul-%{version}.tar.xz
Source1: baselibs.conf
-# PATCH-FIX-UPSTREAM imhangul-0.9.14-gtk-deprecated.patch idoenmez@suse.de -- Replace deprecated functions
-Patch1: imhangul-0.9.14-gtk-deprecated.patch
+# PATCH-FIX-UPSTREAM don't use gtk_alignment_set_padding
+Patch: deprecated-gtk3.14.patch
+BuildRequires: glib2-devel
+BuildRequires: gtk3-devel
+BuildRequires: libhangul-devel
+BuildRequires: libtool
+Provides: locale(gtk3:ko)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: GTK+-2.0 Hangul Input Modules
-%gtk2_immodule_requires
+%{gtk3_immodule_requires}
%description
GTK+-2.0 Hangul input modules.
-
-
-Authors:
---------
- Choe Hwanjin
-
%prep
%setup -q
-%patch1
+%if 0%{?suse_version} >= 1320
+%patch -p1
+%endif
+NOCONFIGURE=1 ./autogen.sh
%build
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
./configure \
- --prefix=%{prefix} \
- --libdir=%{prefix}/%_lib \
- --with-gtk-im-module-dir=%{_libdir}/gtk-2.0/immodules \
+ --prefix=%{_prefix} \
+ --libdir=%{_libdir} \
+ --with-gtk-im-module-dir=%{_libdir}/gtk-3.0/3.0.0/immodules \
%{_target_platform}
-make
+make %{?_smp_mflags}
%install
-make -e DESTDIR=$RPM_BUILD_ROOT install
-%find_lang im-hangul
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%find_lang im-hangul-3.0
+find %{buildroot} -name "*.la" -delete
%post
-%gtk2_immodule_post
+%{gtk3_immodule_post}
/sbin/ldconfig
%postun
-%gtk2_immodule_postun
+%{gtk3_immodule_postun}
/sbin/ldconfig
-%clean
-#rm -rf $RPM_BUILD_ROOT
-
-%files -f im-hangul.lang
+%files -f im-hangul-3.0.lang
%defattr(-,root,root)
-%doc AUTHORS README COPYING ChangeLog INSTALL TODO
-%{prefix}/%{_lib}/gtk-2.0/immodules/
+%doc AUTHORS README COPYING ChangeLog.0 TODO NEWS
+%{_libdir}/gtk-3.0/3.0.0/immodules/im-hangul.so
%changelog
++++++ _service ++++++
<services>
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/choehwanjin/imhangul</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="versionformat">3.1.1+git%cd.%h</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">imhangul-*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled">
<param name="basename">imhangul</param>
</service>
</services>
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/choehwanjin/imhangul</param>
<param name="changesrevision">a4c2796dab2223c3ecf12aa36ded7e892d841b85</param></service></servicedata>++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.fgCABx/_old 2015-08-27 08:57:31.000000000 +0200
+++ /var/tmp/diff_new_pack.fgCABx/_new 2015-08-27 08:57:31.000000000 +0200
@@ -1,2 +1,2 @@
imhangul
- supplements "packageand(imhangul:gtk2-<targettype>)"
+ supplements "packageand(imhangul:gtk3-<targettype>)"
++++++ deprecated-gtk3.14.patch ++++++
Index: imhangul-3.1.1+git20130112.a4c2796/gtkimcontexthangul.c
===================================================================
--- imhangul-3.1.1+git20130112.a4c2796.orig/gtkimcontexthangul.c
+++ imhangul-3.1.1+git20130112.a4c2796/gtkimcontexthangul.c
@@ -1616,7 +1616,6 @@ static GtkWidget*
status_window_new(GtkWidget *parent)
{
GtkWidget *window;
- GtkWidget *alignment;
GtkWidget *label;
GtkStyleContext* style_context;
GtkBorder padding;
@@ -1640,16 +1639,18 @@ status_window_new(GtkWidget *parent)
gtk_style_context_get_padding (style_context, 0, &padding);
gtk_style_context_get_border (style_context, 0, &border);
- alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
- gtk_alignment_set_padding (GTK_ALIGNMENT(alignment),
- border.top + padding.top, border.bottom + padding.bottom,
- border.left + padding.left, border.right + padding.right);
- gtk_container_add (GTK_CONTAINER(window), alignment);
- gtk_widget_show (alignment);
+ gtk_widget_set_margin_top(window, border.top + padding.top);
+ gtk_widget_set_margin_bottom(window, border.bottom + padding.bottom);
+#if GTK_CHECK_VERSION(3, 12, 0)
+ gtk_widget_set_margin_start(window, border.left + padding.left);
+ gtk_widget_set_margin_end(window, border.right + padding.right);
+#else
+ gtk_widget_set_margin_left(window, border.left + padding.left);
+ gtk_widget_set_margin_right(window, border.right + padding.right);
+#endif
/* hangul status window label */
label = gtk_label_new (_("hangul"));
- gtk_container_add (GTK_CONTAINER(alignment), label);
gtk_widget_show (label);
g_signal_connect (G_OBJECT(window), "draw",