[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: Approval needed: SCIM



大力亮 wrote:
> Could anyone review it and give me an approval?
> 
> You can see it here:
> http://briefcase.yahoo.co.jp/bc/ryo_dairiki/lst?.dir=/
> 
> Please download scim-1.2.2-1.src.rpm.

Thanks looks much better now. :)

I did a bit more cleanup and fixing.
Could you take a look at the attached patch
against your version.  With these changes
I think the package can basically be approved
for inclusion.

Cheers, Jens
diff -u scim.spec~ scim.spec
--- scim.spec~	2005-05-14 20:19:45.000000000 +0900
+++ scim.spec	2005-05-14 20:19:45.000000000 +0900
@@ -1,26 +1,24 @@
-Summary:       Smart Chinese/Common Input Method platform
+Summary: Smart Common Input Method platform
 Name:            scim
-Version:          1.2.2
-Release:          1%{?dist}
-License:          LGPL
-Group:            System Environment/Libraries
-URL:              http://scim.freedesktop.org
-Packager:       Ryo Dairiki <ryo-dairiki users sourceforge net>
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:        %{name}-%{version}.tar.gz
-Source1:        xinput-scim
-
-PreReq:         /sbin/ldconfig, /bin/sh
+Version:         1.2.2
+Release:         9
+License:         LGPL
+Group:           System Environment/Libraries
+URL:             http://www.scim-im.org/
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0:         http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
+Source1:         xinput-scim
+PreReq:          /sbin/ldconfig, /bin/sh
 Requires: glib2 >= 2.0.0, gtk2 >= 2.3.5, pango >= 1.0.0, XFree86-libs >= 4.1.0
-BuildRequires:  gtk2-devel >= 2.0.0, pango-devel >= 1.0.0, XFree86-devel >= 4.1.0, pkgconfig >= 0.12, desktop-file-utils
+BuildRequires: gtk2-devel >= 2.0.0, pango-devel >= 1.0.0, XFree86-devel >= 4.1.0, pkgconfig >= 0.12, desktop-file-utils
+PreReq:          %{_sbindir}/alternatives
 
 %description
-SCIM is a developing platform to significant reduce the difficulty of 
-input method development. 
+SCIM is a user friendly and full featured input method user interface and
+also a development platform to make life easier for Input Method developers.
 
 %package devel
-Summary:        Smart Chinese/Common Input Method platform
+Summary:        Smart Common Input Method platform
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig, gtk2-devel, pango-devel
@@ -31,19 +29,13 @@
 Install scim-devel if you want to develop programs which will use
 scim.
 
-
-#--------------------------------------------------
-
 %prep
 %setup -q
 
-
 %build
 %configure
-
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -52,8 +44,7 @@
 mkdir -p ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
 # Kill all .a and .la
-rm -f ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.{a,la}
-rm -f ${RPM_BUILD_ROOT}//opt/gnome/lib/gtk-2.0/immodules/im-scim.{a,la}
+rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.{a,la}
 
 # install setup panel
 desktop-file-install \
@@ -71,11 +62,14 @@
 # install xinput config file.
 install -D %{SOURCE1} ${RPM_BUILD_ROOT}/%{_sysconfdir}/X11/xinit/xinput.d/scim
 
+%find_lang %{name}
 
 %clean
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post
+set -x
+
 /sbin/ldconfig
 
 for llcc in ja_JP ko_KR zh_CN zh_TW
@@ -83,15 +77,8 @@
 	alternatives --install /etc/X11/xinit/xinput.d/$llcc xinput-$llcc /etc/X11/xinit/xinput.d/scim 90
 done
 
-if [ -x "/usr/bin/gtk-query-immodules-2.0-32" ]
-then
-	/usr/bin/gtk-query-immodules-2.0-32 > /etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
-fi
-if [ -x "/usr/bin/gtk-query-immodules-2.0-64" ]
-then
-	/usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/x86_64-redhat-linux-gnu/gtk.immodules
-fi
-
+[ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform}
+[ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
 
 %postun
 /sbin/ldconfig
@@ -108,28 +95,23 @@
 	done
 fi
 
-if [ -x "/usr/bin/gtk-query-immodules-2.0-32" ]
-then
-	/usr/bin/gtk-query-immodules-2.0-32 > /etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
-fi
-if [ -x "/usr/bin/gtk-query-immodules-2.0-64" ]
-then
-	/usr/bin/gtk-query-immodules-2.0-64 > /etc/gtk-2.0/x86_64-redhat-linux-gnu/gtk.immodules
-fi
+[ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform}
+[ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules
 
-%files
-%defattr(-, root, root)
+%files -f %{name}.lang
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README ChangeLog TODO
 %doc docs/dist/manual/zh_CN
 %dir %{_sysconfdir}/scim
-%dir %{_libdir}/scim-1.0/
+%dir %{_libdir}/scim-1.0
 %dir %{_datadir}/scim
 %config(noreplace) %{_sysconfdir}/scim/*
+%{_sysconfdir}/X11/xinit/xinput.d/scim
 %{_bindir}/*
 %{_libdir}/libscim*.so.*
-%{_libdir}/scim-1.0/*
-%{_libdir}/gtk-2.0/immodules/*
-%{_datadir}/scim/*
+%{_libdir}/scim-1.0
+%{_libdir}/gtk-2.0/immodules
+%{_datadir}/scim
 %{_datadir}/locale/*/LC_MESSAGES/scim.mo
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-scim-setup.desktop
@@ -137,19 +119,32 @@
 %{_sysconfdir}/X11/xinit/xinput.d/scim
 
 %files devel
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc docs/html
 %doc docs/developers
-%dir %{_includedir}/scim-1.0
-%{_includedir}/scim-1.0/*
+%{_includedir}/scim-1.0
 %{_libdir}/libscim*.so
 %{_libdir}/libscim*.a
 %{_libdir}/libscim*.la
 %{_libdir}/pkgconfig/*.pc
 
-#--------------------------------------------------
-
 %changelog
+* Fri Mar 13 2005 Ryo Dairiki <ryo-dairiki users sourceforge net> - 1.2.2-9
+- Initial packaging for Fedora Extras
+- cleanup fixes (Konstantin Ryabitsev)
+
+* Sun Jan 9 2005 James Su <suzhe tsinghua org cn>
+- Remove GConf Config module.
+
+* Wed Jan 5 2005 James Su <suzhe tsinghua org cn>
+- Remove table IMEngine.
+
+* Fri Aug 6 2004 James Su <suzhe tsinghua org cn>
+- Move scim-launcher and scim-panel-gtk to /usr/lib/scim-1.0.
+
+* Sun Jun 20 2004  James Su <suzhe tsinghua org cn>
+- Merge all things into one package.
 
-* Fri Mar 13 2005 Ryo Dairiki <ryo-dairiki users sourceforge net> - 1.2.2-0.1
-- Initial packaging for Fedora Extras.
+* Sat Jun 19 2004  James Su <suzhe tsinghua org cn>
+- Added /usr/libexec/scim-launcher.
+- Remove setup module for SocketFrontEnd and SocketIMEngine.

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]