Re: Approval needed again: SCIM

[Jens Petersen <petersen redhat com>]

Konstantin Ryabitsev wrote:
> On 5/16/05, Ryo Dairiki <ryo-dairiki mbm nifty com> wrote:
> I've reviewed the specfile, and there are several improvement
> suggestions I have. See
> http://phy.duke.edu/~icon/misc/fedora-extras/scim.spec.patch for the
> patch. Notably:

Thanks. :)

> 1. PreReq is not required, as everything listed there is assumed to
> exist on the core system.

Actually I think update-gtk-immodules needs to be included though.  And at least 
for Core, requires (prereq) for alternatives is needed - it doesn't seem to do 
any harm to keep it.

> 2. gtk2-devel will pull in everything else via dependencies.

desktop-file-utils should be added however I think.

> 4. rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/*/*.{a,la} wasn't
> finding all the .a files, so I replaced it with a more general find
> statement.

Is it official FE policy to exclude all static libraries, and .la files too?
Can't libtool make use of the .la files when linking shared libs?

(I'm actually planning to propose for FC5 to move (all) static
libs to -static subpackages in order to make -devel packages lighter.)

> 5. ${RPM_BUILD_ROOT}/ : no {} required

Personally I find with {} easier to read, but agree one should fix on one or
the other.

> 6. I've tried to make the specfile conform to the 80-character width
> limit for readability, wherever possible.

I think that is a matter of taste - surely 80 columns is only necessary for
changelog entries?  Personally I generally find unbroken lines in spec files
much easier to read.

Thanks for your help, Jens
diff -u /home/petersen/fedora-extras/scim/ryabitsev/scim.spec~ /home/petersen/fedora-extras/scim/ryabitsev/scim.spec
--- /home/petersen/fedora-extras/scim/ryabitsev/scim.spec~	2005-05-17 19:55:20.000000000 +0900
+++ /home/petersen/fedora-extras/scim/ryabitsev/scim.spec	2005-05-17 19:55:20.000000000 +0900
@@ -9,7 +9,7 @@
 Source0:        http://dl.sourceforge.net/sourceforge/scim/%{name}-%{version}.tar.gz
 Source1:        xinput-scim
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+PreReq:         %{_bindir}/update-gtk-immodules
 BuildRequires:  gtk2-devel, desktop-file-utils
 
 
@@ -44,7 +44,7 @@
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -pm 755 \
-    $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
+   $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{Config,FrontEnd,IMEngine,SetupUI,Helper}
 
 # Kill all .a and .la
 find $RPM_BUILD_ROOT -name "*.a" -o -name '*.la' | xargs rm -f
@@ -84,9 +84,7 @@
         %{_sysconfdir}/X11/xinit/xinput.d/scim 90
 done
 
-if [ -x "%{_bindir}/update-gtk-immodules" ]; then
-    %{_bindir}/update-gtk-immodules %{_target_platform}
-fi
+%{_bindir}/update-gtk-immodules %{_target_platform}
 
 
 %postun
@@ -105,9 +103,7 @@
 	done
 fi
 
-if [ -x "%{_bindir}/update-gtk-immodules" ]; then
-    %{_bindir}/update-gtk-immodules %{_target_platform}
-fi
+%{_bindir}/update-gtk-immodules %{_target_platform}
 
 
 %files -f %{name}.lang
@@ -138,7 +134,7 @@
 %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)
+- cleanup and fixes (Konstantin Ryabitsev, Jens Petersen)
 
 * Sun Jan 9 2005 James Su <suzhe tsinghua org cn>
 - Remove GConf Config module.