scim-1.4.17-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10550 ec354946-7b23-47d6-9f5a-488ba84defc7

s/scim/scim-vl.spec

@@ -1,49 +1,30 @@
-%define	ver	1.4.9
+%define	ver	1.4.17
 %define	libdirver	1.4.0
 
+%define gtk2_immoduledir %{_libdir}/gtk-2.0/2.10.0/immodules
+%define gtk3_immoduledir %{_libdir}/gtk-3.0/3.0.0/immodules
+
 Summary: Smart Common Input Method platform
 Name: scim
 Version: %{ver}
-Release: 9%{?_dist_release}
+Release: 1%{?_dist_release}
 URL: http://www.scim-im.org/
 License: LGPL
 Group: System Environment/Libraries
 
+Vendor: Project Vine
+Distribution: Vine Linux
+
 Source0:   http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 Source2:   scim-icons-0.7.tar.gz
 Source5:   scim-1.4.7_translation-update.tar.bz2
 
-# patches from fedora
-Patch9:    scim_panel_gtk-icon-size-fixes.patch
-Patch11:   scim-1.4.5-panel-menu-fixes.patch
-#Patch12:   scim-fix-unload-segfault.patch
-Patch14:   scim_x11_frontend-ic-focus-LTC27940-215953.patch
-Patch15:   scim-gtkimm-default-snooper-off-213796.patch
-Patch17:   scim-1.4.5-no-rpath-libdir.patch
-Patch19:   scim-1.4.7-remove-locale.patch
-Patch20:   scim-1.4.7-fix-fallback.patch
-Patch21:   scim-1.4.7-fix-capslock.patch
-Patch22:   scim-1.4.7-fix-gdm.patch
-Patch23:   scim-1.4.7-remove-help-frame.patch
-#Patch24:   scim-1.4.7-translation-update-431995.patch
-Patch25:   scim-1.4.7-timeout.patch
-Patch26:   scim-1.4.7-trayicon.patch
-Patch27:   scim-1.4.7-menu-pos.patch
-Patch28:   scim-1.4.7-xim-wrong-format.patch
-Patch29:   scim-1.4.7-bz462820.patch
-Patch30:   scim-1.4.7-imdkit-read-property-properly.patch
-Patch32:   scim-1.4.7-syslibltdl.patch
-Patch33:   scim-1.4.8-fix-dlopen.patch
-Patch34:   scim-1.4.9-fix-disappeared-status-icon.patch
-
-# patch from Mandriva
-Patch31:   scim-1.4.7-support-more-utf8-locales.patch
-
 # vine patch
-Patch100: %{name}-1.4.8-vine.patch
+Patch100: %{name}-1.4.17-vine.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: glib2-devel >= 2.10.0 gtk2-devel >= 2.8.13  pango-devel >= 1.0.0
+BuildRequires: gtk3-devel
 BuildRequires: GConf2-devel >= 2.0.0 pkgconfig >= 0.12
 BuildRequires: libXt-devel
 BuildRequires: autoconf automake gettext libtool
@@ -80,40 +61,16 @@ scim-devel パッケージには、SCIM アプリケーションの開発に必
 ヘッダーファイルと静的ライブラリが含まれています。
 
 %prep
-%setup -q -a2 -a5
+%setup -q -a2
 
 cp -p scim-icons/icons/*.png data/icons
 cp -p scim-icons/pixmaps/*.png data/pixmaps
 
-cp -p scim_translations/*.po po
-
-%patch9 -p1 -b .9-icon-size~
-%patch11 -p1 -b .11-factory-menu~
-#%patch12 -p1 -b .12-unloadsegfault~
-%patch14 -p1 -b .14-xim-focus~
-%patch15 -p1 -b .15-key-snooper~
-%patch17 -p1 -b .17-rpath~
-%patch19 -p1 -b .19-remove-locale~
-%patch20 -p1 -b .20-fix-fallback
-%patch21 -p1 -b .21-fix-capslock
-%patch22 -p1 -b .22-fix-gdm
-%patch23 -p1 -b .23-help-frame
-#%patch24 -p1 -b .24-trans
-%patch25 -p1 -b .25-timeout
-%patch26 -p1 -b .26-trayicon
-%patch27 -p1 -b .27-menu-pos
-%patch28 -p1 -b .28-xim-wrong-format
-%patch29 -p1 -b .29-bz462820
-%patch30 -p1 -b .29-bz466657libtool
-%patch31 -p1 -b .support-more-utf8-locales
-%patch32 -p1 -b .32-sysltdl
-%patch33 -E -p1 -b .fix-dlopen
-%patch34 -p1 -b .fix-disappeared-status-icon
-
 %patch100 -p1 -b .vine
 
 %build
 autoreconf -vfi
+intltoolize --force
 %configure --disable-static
 %{__make} %{?_smp_mflags}
 
@@ -141,25 +98,28 @@ desktop-file-install --delete-original  \
 
 %post
 /sbin/ldconfig
-%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
+%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules 2>/dev/null ||:
+%{_bindir}/gtk-query-immodules-3.0 > %{_libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null ||:
 
 %postun
 /sbin/ldconfig
-%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules
+%{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/%{_arch}/gtk.immodules 2>/dev/null ||:
+%{_bindir}/gtk-query-immodules-3.0 > %{_libdir}/gtk-3.0/3.0.0/immodules.cache 2>/dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README THANKS TODO
 %{_bindir}/scim
 %{_bindir}/scim-config-agent
+%{_bindir}/scim-im-agent
 %{_bindir}/scim-setup
 %{_libdir}/libscim-1.0.so.*
 %{_libdir}/libscim-gtkutils-1.0.so.*
 %{_libdir}/libscim-x11utils-1.0.so.*
-%dir %{_libdir}/gtk-2.0
+%gtk2_immoduledir/im-scim.so
-%dir %{_libdir}/gtk-2.0/immodules
+%gtk3_immoduledir/im-scim.so
-%{_libdir}/gtk-2.0/immodules/im-scim.so
 %dir %{_libdir}/scim-1.0
 %{_libdir}/scim-1.0/scim-helper-launcher
 %{_libdir}/scim-1.0/scim-helper-manager
@@ -188,7 +148,7 @@ desktop-file-install --delete-original  \
 
 %files devel
 %defattr(-, root, root)
-%doc docs/html docs/developers
+%doc docs/developers
 %{_libdir}/libscim-1.0.so
 %{_libdir}/libscim-gtkutils-1.0.so
 %{_libdir}/libscim-x11utils-1.0.so
@@ -198,6 +158,13 @@ desktop-file-install --delete-original  \
 %{_includedir}/scim-1.0
 
 %changelog
+* Thu Jul  7 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.17-1
+- new upstream release.
+- dropped Source5: upstream is newer than it.
+- dropped all imported patches: fixed in upstream.
+- updated Patch100.
+- added BR: gtk3-devel.
+
 * Mon Dec 30 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.4.9-9
 - rebuild with VineSeed environment