[packages/im-ja] - up to 1.5, disable gnome(2) applet by default

qboosh qboosh at pld-linux.org
Sat Jul 20 18:31:25 CEST 2024


commit a3f1428aff1bfba6b32818481b831504809d5490
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 20 18:07:02 2024 +0200

    - up to 1.5, disable gnome(2) applet by default

 im-ja-link.patch |  9 ++++++
 im-ja.spec       | 86 +++++++++++++++++++++++++++++++++++++++-----------------
 2 files changed, 69 insertions(+), 26 deletions(-)
---
diff --git a/im-ja.spec b/im-ja.spec
index 824a630..1299c03 100644
--- a/im-ja.spec
+++ b/im-ja.spec
@@ -1,22 +1,40 @@
+#
+# Conditional build:
+%bcond_without	anthy	# Anthy support
+%bcond_without	canna	# Canna support
+%bcond_with	wnn	# Wnn support (build error)
+%bcond_with	gnome2	# GNOME 2.x panel applet
+
 Summary:	Japanese input method for GTK2
 Summary(pl.UTF-8):	Metoda wprowadzania znaków japońskich dla GTK2
 Name:		im-ja
-Version:	1.3
+Version:	1.5
 Release:	1
-License:	LGPL
+License:	LGPL v2+
 Group:		Applications/Editors
-Source0:	http://im-ja.sourceforge.net/%{name}-%{version}.tar.gz
-# Source0-md5:	20ceb957496d84f854e379f40b0e704a
-BuildRequires:	Canna-devel
+Source0:	https://im-ja.sourceforge.net/%{name}-%{version}.tar.gz
+# Source0-md5:	8986574373d03e685730e16d8f15ade9
+Patch0:		%{name}-link.patch
+URL:		https://im-ja.sourceforge.net/
+%{?with_canna:BuildRequires:	Canna-devel}
+%{?with_wnn:BuildRequires:	FreeWnn-devel}
 BuildRequires:	GConf2-devel >= 2.0
-BuildRequires:	gnome-panel-devel >= 2.0.0
-BuildRequires:	gtk+2-devel >= 1:2.2.0
+BuildRequires:	autoconf >= 2.52
+BuildRequires:	automake
+%{?with_anthy:BuildRequires:	anthy-devel}
+BuildRequires:	gettext-tools
+%{?with_gnome2:BuildRequires:	gnome-panel2-devel >= 2.0.0}
+BuildRequires:	gtk+2-devel >= 2:2.4.0
+BuildRequires:	intltool
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
-BuildRequires:	libglade2-devel >= 1:2.0
+BuildRequires:	libglade2-devel >= 1:2.4.0
+BuildRequires:	xorg-lib-libSM-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires(post):	GConf2
 Requires(post,postun):	gtk+2
-Requires:	gtk+2 >= 2.2.0
+Requires:	gtk+2 >= 2:2.4.0
+Requires:	libglade2 >= 1:2.4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -33,11 +51,20 @@ mogą być konfigurowane narzędziem z graficznym interfejsem.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--disable-anthy \
-	--disable-wnn
+	%{!?with_anthy:--disable-anthy} \
+	%{!?with_canna:--disable-canna} \
+	%{!?with_gnome:--disable-gnome} \
+	%{!?with_wnn:--disable-wnn}
 
 %{__make}
 
@@ -45,10 +72,11 @@ mogą być konfigurowane narzędziem z graficznym interfejsem.
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	schemasdir=/etc/gconf/schemas
 
 # useless
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/immodules/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/immodules/*.la
 
 %find_lang %{name}
 
@@ -69,18 +97,24 @@ umask 022
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 # COPYING contains only note about different licenses, not license text
-%doc README COPYING TODO AUTHORS ChangeLog
-%attr(755,root,root) %{_bindir}/*
+%doc AUTHORS COPYING ChangeLog README TODO
+%attr(755,root,root) %{_bindir}/im-ja-conf
+%attr(755,root,root) %{_bindir}/im-ja-xim-server
 %attr(755,root,root) %{_libdir}/gtk-2.0/*/immodules/im-ja.so
-%dir %{_libdir}/im-ja
-# -gnome?
-%attr(755,root,root) %{_libdir}/im-ja/im-ja-applet
-%attr(755,root,root) %{_libdir}/im-ja/kpengine
-%{_libdir}/bonobo/servers/*.server
+%dir %{_libexecdir}/im-ja
+%attr(755,root,root) %{_libexecdir}/im-ja/im-ja-helper
+%attr(755,root,root) %{_libexecdir}/im-ja/kpengine
 %{_datadir}/%{name}
-%{_datadir}/control-center-2.0/capplets/*.desktop
-%{_datadir}/gnome-2.0/ui/*.xml
-%{_pixmapsdir}/*.jpg
-%{_pixmapsdir}/*.png
-%{_mandir}/man1/*
-%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_sysconfdir}/gconf/schemas/im-ja.schemas
+%{_desktopdir}/im-ja.desktop
+%{_pixmapsdir}/im-ja-about.jpg
+%{_pixmapsdir}/im-ja-capplet.png
+%{_mandir}/man1/im-ja-conf.1*
+%{_mandir}/man1/im-ja-xim-server.1*
+
+# -gnome?
+%if %{with gnome2}
+%attr(755,root,root) %{_libexecdir}/im-ja/im-ja-applet
+%{_libdir}/bonobo/servers/GNOME_ImJaApplet.server
+%{_datadir}/gnome-2.0/ui/GNOME_ImJaApplet.xml
+%endif
diff --git a/im-ja-link.patch b/im-ja-link.patch
new file mode 100644
index 0000000..70a3013
--- /dev/null
+++ b/im-ja-link.patch
@@ -0,0 +1,9 @@
+--- im-ja-1.5/src/xim/Makefile.am.orig	2006-04-18 12:52:23.000000000 +0200
++++ im-ja-1.5/src/xim/Makefile.am	2024-07-20 17:23:09.608539902 +0200
+@@ -87,5 +87,5 @@ im_ja_xim_server_CFLAGS =    \
+     @DISABLE_ANTHY_FLAG@     \
+     @DISABLE_SKK_FLAG@       \
+     @X_CFLAGS@
+-im_ja_xim_server_LDADD = IMdkit/libXimd.a
++im_ja_xim_server_LDADD = IMdkit/libXimd.a -lm
+ im_ja_xim_server_LDFLAGS = @GTK_LIBS@ @GCONF_LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lX11 @CANNA_LIBS@ @WNN_LIBS@ @ANTHY_LIBS@
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/im-ja.git/commitdiff/a3f1428aff1bfba6b32818481b831504809d5490



More information about the pld-cvs-commit mailing list