[scim] check patches for 1.4.10

Peng Wu pwu at fedoraproject.org
Tue Jun 21 04:54:46 UTC 2011


commit f0f8ca429d86aa631c61bfbef4e67493ca1d1e42
Author: Peng Wu <alexepico at gmail.com>
Date:   Tue Jun 21 12:45:47 2011 +0800

    check patches for 1.4.10

 scim-1.4.5-panel-menu-fixes.patch |   73 -------------------------------------
 scim.spec                         |   35 +++++-------------
 2 files changed, 9 insertions(+), 99 deletions(-)
---
diff --git a/scim.spec b/scim.spec
index 55a61e3..6a5062d 100644
--- a/scim.spec
+++ b/scim.spec
@@ -1,6 +1,6 @@
 Name:      scim
 Version:   1.4.10
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   Smart Common Input Method platform
 
 License:   LGPLv2+
@@ -49,11 +49,8 @@ Obsoletes:  scim-lang-thai
 Obsoletes:  scim-lang-tibetan
 Patch1:    scim-add-restart.patch
 Patch7:    scim_panel_gtk-emacs-cc-style.patch
-Patch11:   scim-1.4.5-panel-menu-fixes.patch
-Patch14:   scim_x11_frontend-ic-focus-LTC27940-215953.patch
-Patch26:   scim-1.4.7-trayicon.patch
-Patch31:   scim-1.4.7-syslibltdl.patch
-Patch32:   scim-1.4.8-fix-dlopen.patch
+#Patch31:   scim-1.4.7-syslibltdl.patch
+#Patch32:   scim-1.4.8-fix-dlopen.patch
 
 %description
 SCIM is a user friendly and full featured input method user interface and
@@ -73,15 +70,6 @@ The scim-devel package includes the header files for the scim package.
 Install scim-devel if you want to develop programs which will use scim.
 
 
-%package doc
-Summary:    Smart Common Input Method platform documentation
-Group:      Documentation
-Obsoletes:  iiimf-docs <= 1:12.2
-
-%description doc
-SCIM development documentation files generated from the sourcecode.
-
-
 %package gtk
 Summary:    Smart Common Input Method Gtk IM module
 Group:      System Environment/Libraries
@@ -132,11 +120,8 @@ mv configs/global{,.orig}
 cp -p %{SOURCE4} configs/global
 
 %patch7 -p1 -b .7-emacs-ccmode~
-%patch11 -p1 -b .11-factory-menu~
-%patch14 -p1 -b .14-xim-focus~
-%patch26 -p1 -b .26-trayicon
-%patch31 -p1 -b .31-sysltdl
-%patch32 -E -p1 -b .fix-dlopen
+#%patch31 -p1 -b .31-sysltdl
+#%patch32 -E -p1 -b .fix-dlopen
 
 # patch17 touches configure.ac and Makefile.am
 ./bootstrap
@@ -238,12 +223,6 @@ fi
 %{_libdir}/libscim*.so
 %{_libdir}/pkgconfig/*.pc
 
-
-%files doc
-%defattr(-,root,root,-)
-%doc docs/html
-
-
 %files gtk
 %defattr(-,root,root,-)
 %{_libdir}/gtk-2.0/immodules/im-scim.so
@@ -265,6 +244,10 @@ fi
 
 
 %changelog
+* Tue Jun 21 2011  Peng Wu <pwu at redhat.com> - 1.4.10-2
+- Refresh patch for 1.4.10
+- Remove patch scim-1.4.5-panel-menu-fixes.patch scim_x11_frontend-ic-focus-LTC27940-215953.patch scim-1.4.7-trayicon.patch
+
 * Tue Jun 21 2011  Peng Wu <pwu at redhat.com> - 1.4.10-1
 - Update to 1.4.10
 - Remove patch scim_panel_gtk-icon-size-fixes.patch scim-gtkimm-default-snooper-off-213796.patch scim-1.4.5-no-rpath-libdir.patch scim-1.4.7-remove-locale.patch scim-1.4.7-fix-fallback.patch scim-1.4.7-fix-capslock.patch scim-1.4.7-fix-gdm.patch scim-1.4.7-remove-help-frame.patch scim-1.4.7-timeout.patch scim-1.4.7-menu-pos.patch scim-1.4.7-xim-wrong-format.patch scim-1.4.7-bz462820.patch scim-1.4.7-imdkit-read-property-properly.patch


More information about the scm-commits mailing list