[packages/scim-bridge] - added qt3 patch to install qt3 module in proper place - pl, general cleanup

qboosh qboosh at pld-linux.org
Sat Sep 15 21:30:43 CEST 2012 

commit ba62d872d6c0a79103460bb7d7d1819168c8bb98
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 15 21:31:27 2012 +0200

    - added qt3 patch to install qt3 module in proper place
    - pl, general cleanup

 scim-bridge-qt3.patch | 22 +++++++++++++
 scim-bridge.spec      | 91 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 82 insertions(+), 31 deletions(-)
---
diff --git a/scim-bridge.spec b/scim-bridge.spec
index ca9365c..bcae8fb 100644
--- a/scim-bridge.spec
+++ b/scim-bridge.spec
@@ -1,15 +1,15 @@
 #
 # Conditional build:
-%bcond_with	qt3		# don't build qt3 input module
+%bcond_without	qt3		# don't build qt3 input module
 %bcond_without	qt4		# don't build qt4 input module
 #
-Summary:	SCIM Bridge Gtk IM module
+Summary:	SCIM Bridge GTK+ IM module
+Summary(pl.UTF-8):	Moduł IM GTK+ SCIM Bridge
 Name:		scim-bridge
 Version:	0.4.16
 Release:	1
-License:	GPLv2+ or LGPLv2+
+License:	GPL v2+ or LGPL v2+
 Group:		Libraries
-URL:		http://www.scim-im.org/projects/scim_bridge
 Source0:	http://downloads.sourceforge.net/scim/%{name}-%{version}.tar.gz
 # Source0-md5:	0011b178c4a0d2b0de26e7a14545323c
 Patch0:		%{name}-fix-gdm.patch
@@ -19,48 +19,74 @@ Patch3:		%{name}-EOF.patch
 Patch4:		%{name}-fix-gtk-key-snooper.patch
 Patch5:		%{name}-fixes-null-imengine.patch
 Patch6:		%{name}-ac.patch
-%{?with_qt3:BuildRequires:	qt-devel}
-%if %{with qt4}
-BuildRequires:	qt4-qmake
-BuildRequires:	QtGui-devel
-%endif
-BuildRequires:	autoconf
+Patch7:		%{name}-qt3.patch
+URL:		http://www.scim-im.org/projects/scim_bridge
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	gdk-pixbuf2-devel >= 2.4.0
+BuildRequires:	gtk+2-devel >= 2:2.4.0
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
+BuildRequires:	pango-devel >= 1:1.1.0
+%{?with_qt3:BuildRequires:	qt-devel >= 3.3}
 BuildRequires:	scim-devel >= 1.4.6
+%if %{with qt4}
+BuildRequires:	QtCore-devel >= 4
+BuildRequires:	QtGui-devel >= 4
+BuildRequires:	qt4-qmake >= 4
+%endif
 Requires:	scim >= 1.4.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-SCIM Bridge is a C implementation of a Gtk IM module for SCIM.
+SCIM Bridge is a C implementation of a GTK+ IM module for SCIM.
+
+%description -l pl.UTF-8
+SCIM Bridge to implementacja w C modułu IM GTK+ dla SCIM-a.
 
 %package gtk2
-Summary:	SCIM Bridge Gtk+2 IM module
+Summary:	SCIM Bridge GTK+ 2.x IM module
+Summary(pl.UTF-8):	Moduł IM GTK+ 2.x SCIM Bridge
 Group:		Libraries
-Requires(post):	gtk+2
-Requires(postun):	gtk+2
+Requires(post,postun):	gtk+2
 # need %{_bindir}/scim-bridge
 Requires:	%{name} = %{version}-%{release}
 
 %description gtk2
-This package provides the SCIM Bridge GTK+2 input method module.
+This package provides the SCIM Bridge GTK+ 2.x input method module.
+
+%description gtk2 -l pl.UTF-8
+Ten pakiet udostępnia moduł metody wprowadzania znaków GTK+ 2.x SCIM
+Bridge.
 
 %package qt
-Summary:	SCIM Bridge Qt IM module
+Summary:	SCIM Bridge Qt 4.x IM module
+Summary(pl.UTF-8):	Moduł IM Qt 4.x SCIM Bridge
 Group:		Libraries
 # need %{_bindir}/scim-bridge
 Requires:	%{name} = %{version}-%{release}
+Requires:	QtGui >= 4
 
 %description qt
-This package provides the SCIM Bridge Qt input method module.
+This package provides the SCIM Bridge Qt 4.x input method module.
+
+%description qt -l pl.UTF-8
+Ten pakiet udostępnia moduł metody wprowadzania znaków Qt 4.x SCIM
+Bridge.
 
 %package qt3
-Summary:	SCIM Bridge Qt3 IM module
+Summary:	SCIM Bridge Qt 3.x IM module
+Summary(pl.UTF-8):	Moduł IM Qt 3.x SCIM Bridge
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	qt >= 3.3
 
 %description qt3
-This package provides the SCIM Bridge Qt3 input method module.
+This package provides the SCIM Bridge Qt 3.x input method module.
+
+%description qt3 -l pl.UTF-8
+Ten pakiet udostępnia moduł metody wprowadzania znaków Qt 3.x SCIM
+Bridge.
 
 %prep
 %setup -q
@@ -71,6 +97,7 @@ This package provides the SCIM Bridge Qt3 input method module.
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -78,34 +105,36 @@ This package provides the SCIM Bridge Qt3 input method module.
 %{__autoconf}
 %{__automake}
 %configure \
-	--%{?with_qt3:en}%{!?with_qt3:dis}able-qt3-immodule \
-	--%{?with_qt4:en}%{!?with_qt4:dis}able-qt4-immodule \
-	--disable-documents
+	--disable-documents \
+	%{!?with_qt3:--disable-qt3-immodule} \
+	%{!?with_qt4:--disable-qt4-immodule}
 
-%{__make}
+%{__make} \
+	qt3moduledir=%{_libdir}/qt/plugins-mt/inputmethods
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	qt3moduledir=%{_libdir}/qt/plugins-mt/inputmethods
 
 %{__rm} $RPM_BUILD_ROOT/%{_libdir}/gtk-2.0/*/immodules/*.{la,a}
-%{?with_qt3:%{__rm} $RPM_BUILD_ROOT%{_libdir}/qt-3.3/plugins/*/*.{la,a}}
-%{?with_qt4:%{__rm} $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/*/*.{la,a}}
+%{?with_qt3:%{__rm} $RPM_BUILD_ROOT%{_libdir}/qt/plugins-mt/inputmethods/*.{la,a}}
+%{?with_qt4:%{__rm} $RPM_BUILD_ROOT%{_libdir}/qt4/plugins/inputmethods/*.{la,a}}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post gtk2
-%if "%{_lib}" != "lib"
+%if "%{_lib}" == "lib64"
 %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk64-2.0/gtk.immodules
 %else
 %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
 %endif
 
 %postun gtk2
-%if "%{_lib}" != "lib"
+%if "%{_lib}" == "lib64"
 %{_bindir}/gtk-query-immodules-2.0-64 > %{_sysconfdir}/gtk64-2.0/gtk.immodules
 %else
 %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
@@ -113,7 +142,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING doc
+%doc AUTHORS COPYING ChangeLog doc/{developer,user}
 %attr(755,root,root) %{_bindir}/scim-bridge
 
 %files gtk2
@@ -123,11 +152,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with qt4}
 %files qt
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qt4/plugins/inputmethods/*.so
+%attr(755,root,root) %{_libdir}/qt4/plugins/inputmethods/im-scim-bridge.so
 %endif
 
 %if %{with qt3}
 %files qt3
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/qt-3.3/plugins/inputmethods/*.so
+%attr(755,root,root) %{_libdir}/qt/plugins-mt/inputmethods/im-scim-bridge.so
 %endif
diff --git a/scim-bridge-qt3.patch b/scim-bridge-qt3.patch
new file mode 100644
index 0000000..0149cdd
--- /dev/null
+++ b/scim-bridge-qt3.patch
@@ -0,0 +1,22 @@
+--- scim-bridge-0.4.16/client-qt/qt3/Makefile.am.orig	2009-01-17 17:57:16.000000000 +0100
++++ scim-bridge-0.4.16/client-qt/qt3/Makefile.am	2012-09-15 20:28:29.754579771 +0200
+@@ -24,8 +24,8 @@
+ 
+ noinst_HEADERS = ../scim-bridge-client-qt.h ../scim-bridge-client-imcontext-qt.h  ../scim-bridge-client-key-event-utility-qt.h ../scim-bridge-client-common-qt.h
+ 
+-moduledir = @QT3_PREFIX@/plugins/inputmethods
+-module_LTLIBRARIES = im-scim-bridge.la
++qt3moduledir = @QT3_PREFIX@/plugins/inputmethods
++qt3module_LTLIBRARIES = im-scim-bridge.la
+ 
+ im_scim_bridge_la_SOURCES = ../im-scim-bridge-qt.cpp \
+ 							../scim-bridge-client-qt.cpp \
+@@ -36,7 +36,7 @@
+ im_scim_bridge_la_CXXFLAGS=@QT3_CFLAGS@ -DQT_IMMODULE
+ im_scim_bridge_la_CFLAGS  =@QT3_CFLAGS@ -DQT_IMMODULE
+ 
+-im_scim_bridge_la_LDFLAGS = -rpath $(moduledir) \
++im_scim_bridge_la_LDFLAGS = -rpath $(qt3moduledir) \
+ 							-avoid-version -no-undefined \
+ 							-module \
+ 							@QT3_LIBS@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/scim-bridge.git/commitdiff/ba62d872d6c0a79103460bb7d7d1819168c8bb98

More information about the pld-cvs-commit mailing list