Hello community, here is the log from the commit of package scim-unikey for openSUSE:Factory checked in at 2012-06-10 20:19:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scim-unikey (Old) and /work/SRC/openSUSE:Factory/.scim-unikey.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scim-unikey", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/scim-unikey/scim-unikey.changes 2012-02-14 13:11:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.scim-unikey.new/scim-unikey.changes 2012-06-10 21:52:31.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 10 09:51:28 UTC 2012 - [email protected] + +- fix for factory + * replace gtk_signal_connect to g_signal_connect. + * replace GTK_OBJECT to G_OBJECT. + +------------------------------------------------------------------- New: ---- gtk-replace-gtk_signal_connect-and-GTK_OBJECT.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scim-unikey.spec ++++++ --- /var/tmp/diff_new_pack.iieKSo/_old 2012-06-10 21:52:32.000000000 +0200 +++ /var/tmp/diff_new_pack.iieKSo/_new 2012-06-10 21:52:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package scim-unikey # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: scim-unikey Version: 0.3.1 Release: 0 @@ -23,6 +24,8 @@ Group: System/Localization Url: http://code.google.com/p/scim-unikey/ Source: %{name}-%{version}.tar.bz2 +#FIX-FOR-UPSTREAM replace old gtk functions for openSUSE +Patch1: gtk-replace-gtk_signal_connect-and-GTK_OBJECT.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: scim-devel >= 1.4.7 @@ -37,36 +40,39 @@ %prep %setup -q +%if 0%{?suse_version} >= 1140 +%patch1 -p1 +%endif %build -%configure -libdir=%_libdir --prefix=%{_prefix} -%__make +%configure -libdir=%{_libdir} --prefix=%{_prefix} +make %install %makeinstall -%__rm -f %{buildroot}%{_libdir}/*.so +rm -f %{buildroot}%{_libdir}/*.so %if ! 0%{?sles_version} -%if %_lib == lib64 -%__mv %{buildroot}/usr/{lib,lib64}/scim-setup-unikey +%if %{_lib} == lib64 +mv %{buildroot}%{_prefix}/{lib,lib64}/scim-setup-unikey %endif %endif -find $RPM_BUILD_ROOT -name *.la -exec rm '{}' + +find %{buildroot} -name *.la -exec rm '{}' + %find_lang %{name} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING INSTALL NEWS README -%_libdir/scim-1.0/1.4.0/IMEngine/unikey.* -%_libdir/scim-1.0/1.4.0/Helper/unikey-helper.so -%_datadir/scim-unikey/ -%_libdir/libunikey-scim.so.* -%_datadir/scim/icons/scim-unikey*.png -%_libdir/scim-setup-unikey +%doc AUTHORS ChangeLog COPYING NEWS README +%{_libdir}/scim-1.0/1.4.0/IMEngine/unikey.* +%{_libdir}/scim-1.0/1.4.0/Helper/unikey-helper.so +%{_datadir}/scim-unikey/ +%{_libdir}/libunikey-scim.so.* +%{_datadir}/scim/icons/scim-unikey*.png +%{_libdir}/scim-setup-unikey %changelog ++++++ gtk-replace-gtk_signal_connect-and-GTK_OBJECT.patch ++++++ diff -urN scim-unikey-0.3.1.orig/setup/unikey_setup.cpp scim-unikey-0.3.1/setup/unikey_setup.cpp --- scim-unikey-0.3.1.orig/setup/unikey_setup.cpp 2012-06-10 17:45:00.043659980 +0800 +++ scim-unikey-0.3.1/setup/unikey_setup.cpp 2012-06-10 17:46:54.106234000 +0800 @@ -24,7 +24,7 @@ GtkWidget* main_dlg = unikey_main_setup_dialog_new(); // create main dlg gtk_window_set_title(GTK_WINDOW(main_dlg), "Scim-Unikey setup v" PACKAGE_VERSION); - gtk_signal_connect(GTK_OBJECT(main_dlg), "destroy", gtk_main_quit, NULL); // connect with signal + g_signal_connect(G_OBJECT(main_dlg), "destroy", gtk_main_quit, NULL); // connect with signal UnikeyMainSetupOptions opt; // create option set_default_config(&opt); // create default option -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
