Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2012-10-08 07:11:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2012-06-05 15:31:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2012-10-08 07:11:26.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Oct 5 15:31:37 UTC 2012 - [email protected] + +- Better detect for architecture specific libdir + +------------------------------------------------------------------- New: ---- gcin-libdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.cfH1BW/_old 2012-10-08 07:11:27.000000000 +0200 +++ /var/tmp/diff_new_pack.cfH1BW/_new 2012-10-08 07:11:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gcin # -# 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 @@ -17,12 +17,12 @@ Summary: Chinese input method server -Name: gcin -Version: 2.7.5 -Release: 1 License: LGPL-2.1 -URL: http://hyperrate.com/dir.php?eid=67 Group: System/I18n/Chinese +Name: gcin +Version: 2.7.5 +Release: 0 +Url: http://hyperrate.com/dir.php?eid=67 Source0: gcin-%{version}.tar.bz2 Source1: xim.d-gcin Source2: gcin-README.suse @@ -30,24 +30,30 @@ Patch0: configure146p12.diff Patch1: gcin_scripts_modify-XIM_103.diff Patch2: icon_path.diff -BuildRoot: %{_builddir}/%{name}-%{version}-root +Patch3: gcin-libdir.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libjpeg-devel pkg-config gtk2-devel libqt4-devel update-desktop-files BuildRequires: anthy-devel +BuildRequires: gtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: libqt4-devel +BuildRequires: pkg-config BuildRequires: qt3-devel +BuildRequires: update-desktop-files %gtk2_immodule_requires %if %suse_version > 1130 -BuildRequires: gtk3-devel libchewing-devel +BuildRequires: gtk3-devel +BuildRequires: libchewing-devel %endif -Requires: gtk2 >= 2.2.4 Requires: %{name}-branding Requires: %{name}-qt4-immodule +Requires: gtk2 >= 2.2.4 %if %suse_version > 1130 Requires: %{name}-gtk3-immodule Requires: libreoffice-gnome %endif -Requires: %{name}-chewing-module Requires: %{name}-anthy-module +Requires: %{name}-chewing-module PreReq: /usr/bin/touch Provides: locale(zh_TW;zh_HK;zh_MO) @@ -57,17 +63,19 @@ %package branding-upstream Summary: Upstream branding of gcin +License: LGPL-2.1 Group: System/I18n/Chinese Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) Requires: gcin + %description branding-upstream This package provides upstream look and feel for gcin %package qt3-immodule -License: GPL-2.0 Summary: Gcin qt3 immodule +License: GPL-2.0 Group: System/I18n/Chinese Requires: %{name} = %{version} @@ -75,8 +83,8 @@ gcin qt3 immodule, support Qt3-based applications %package qt4-immodule -License: GPL-2.0 Summary: Gcin qt4 immodule +License: GPL-2.0 Group: System/I18n/Chinese Requires: %{name} = %{version} @@ -85,6 +93,7 @@ %package anthy-module Summary: Gcin anthy module +License: LGPL-2.1 Group: System/I18n/Chinese Requires: %{name} = %{version} @@ -94,6 +103,7 @@ %if %suse_version > 1130 %package chewing-module Summary: Gcin chewing module +License: LGPL-2.1 Group: System/I18n/Chinese Requires: %{name} = %{version} @@ -103,6 +113,7 @@ %package gtk3-immodule Summary: Gcin gtk3 immodule +License: LGPL-2.1 Group: System/I18n/Chinese Requires: %{name} = %{version} %gtk3_immodule_requires @@ -111,12 +122,12 @@ gcin gtk3 immodule, support gtk3-based applications %endif - %prep %setup %patch0 %patch1 %patch2 +%patch3 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %configure --prefix=/usr --use_i18n=Y --use_qt3=Y \ --use_anthy=Y --use_chewing=Y @@ -286,7 +297,6 @@ %{_libdir}/gtk-3.0/immodules/im-gcin.so %endif - %post /sbin/ldconfig %{_gtk2_query_immodules_update_cache} @@ -323,5 +333,4 @@ %postun anthy-module /sbin/ldconfig - %changelog ++++++ gcin-libdir.patch ++++++ Index: gcin-2.7.5/configure =================================================================== --- gcin-2.7.5.orig/configure +++ gcin-2.7.5/configure @@ -161,12 +161,11 @@ else fi fi - +system_lib=`file /bin/bash` LIB='lib' -if [ -d /usr/lib64 -a -d /lib64 ]; then -LIB='lib64' -# for fedora 64bit -GTK_QUERY_IM_64='-64' +if $(echo $system_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC)');then + LIB=lib64 + GTK_QUERY_IM_64='-64' fi QT_IM='N' -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
