From 32f92f55af49347fffbfaed50c77b11e69f6371bd789ef2ed51f05a7abc2bb50 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 2 Feb 2007 15:16:42 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=2 --- uim.changes | 8 +++ uim.spec | 140 ++++++++++++++++++++++------------------------------ 2 files changed, 67 insertions(+), 81 deletions(-) diff --git a/uim.changes b/uim.changes index 6ad10fa..53c707c 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Feb 2 13:56:50 CET 2007 - sbrabec@suse.cz + +- Removed references to /opt/gnome. +- Bi-arch libexecdir fix. +- Package each file only once. +- Use %ghost for autogenerated files. + ------------------------------------------------------------------- Mon Dec 25 19:04:31 CET 2006 - schwab@suse.de diff --git a/uim.spec b/uim.spec index 4f2d342..80505d6 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim (Version 1.2.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,14 +11,14 @@ # norootforbuild Name: uim -BuildRequires: anthy-devel canna-devel emacs-x11 gcc-c++ gnome-panel-devel gnutls-devel intltool libgnomeprintui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser pkgconfig qt3-devel update-desktop-files xemacs +BuildRequires: anthy-devel canna-devel emacs-x11 gcc-c++ gnome-panel-devel gnutls-devel intltool libgnomeprintui-devel libwnck-devel mDNSResponder-devel perl-XML-Parser pkg-config qt3-devel update-desktop-files xemacs License: GNU General Public License (GPL) Group: System/I18n/Japanese Autoreqprov: on -PreReq: /usr/bin/touch +PreReq: %{_bindir}/touch Provides: locale(xorg-x11:ja) Version: 1.2.1 -Release: 37 +Release: 43 URL: http://uim.freedesktop.org/wiki/ # svn co http://freedesktop.org:8080/svn/uim/trunk # Source0: http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2 @@ -57,7 +57,7 @@ Authors: %package devel Summary: Include Files and Libraries mandatory for Development. Group: System/I18n/Japanese -Requires: %{name} = %{version} +Requires: %{name} = %{version} glibc-devel %description devel Include Files and Libraries mandatory for Development. @@ -118,47 +118,28 @@ Authors: %patch5 #%patch6 %patch7 -for i in $( find . -name ".svn") -do - rm -rf $i -done cp emacs/README README.emacs iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs %build -rm -f config.cache -# update config.{guess,sub} -%{?suse_update_config} libtoolize --force --copy autoreconf --force --install -#export QTDIR=/usr/lib/qt3 -export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" -./configure --prefix=/usr \ - --bindir=%{_bindir} \ - --libdir=%{_libdir} \ - --libexecdir=%{_libdir}/uim \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --without-m17nlib \ - --with-canna \ - --with-qt \ - --with-qt-immodule \ - %{_target_cpu}-suse-linux -# --disable-scm-nested-eval --enable-callback-queue \ +%configure\ + --libexecdir=%{_prefix}/lib/uim \ + --without-m17nlib\ + --with-canna\ + --with-qt\ + --with-qt-immodule +# --disable-scm-nested-eval --enable-callback-queue\ make %install make DESTDIR=$RPM_BUILD_ROOT install -mkdir -p $RPM_BUILD_ROOT/opt/gnome/{%_lib,bin} -mv $RPM_BUILD_ROOT/%{_libdir}/gtk-* $RPM_BUILD_ROOT/opt/gnome/%_lib/ -mv $RPM_BUILD_ROOT/%{_libdir}/bonobo/ $RPM_BUILD_ROOT/opt/gnome/%_lib/ -mv $RPM_BUILD_ROOT/%{_bindir}/*-gtk-* $RPM_BUILD_ROOT/opt/gnome/bin/ -rm $RPM_BUILD_ROOT/%{_libdir}/uim/plugin/*.*a +rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a $RPM_BUILD_ROOT%{_prefix}/lib/*/*/*/*.*a $RPM_BUILD_ROOT%{_libdir}/*/*/*/*.*a # this file is generated by "uim-module-manager". # touch it here to make sure that it is in the file list of the # package, then it will be deleted when the package is uninstalled: -touch $RPM_BUILD_ROOT/usr/share/uim/modules +touch $RPM_BUILD_ROOT%{_datadir}/uim/modules mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ja install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-uim \ $RPM_BUILD_ROOT/etc/X11/xim.d/uim @@ -166,30 +147,30 @@ pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ja ln -s ../uim 60-uim popd # GNU Emacs: -install -m 644 $RPM_SOURCE_DIR/suse-start-uim.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/ -pushd $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/uim-el +install -m 644 $RPM_SOURCE_DIR/suse-start-uim.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ +pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/uim-el for i in $(find . -name "*.el") do emacs -no-site-file -q -batch -eval '(setq load-path (cons "." load-path))' -f batch-byte-compile $i done popd # XEmacs -mkdir -p $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el -install -m 644 emacs/*.el $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el -pushd $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el +mkdir -p $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/uim-el +install -m 644 emacs/*.el $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/uim-el +pushd $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/uim-el for i in $(find . -name "*.el") do xemacs -no-site-file -q -batch -eval '(setq load-path (cons "." load-path))' -f batch-byte-compile $i done popd install -m 644 $RPM_SOURCE_DIR/xemacs-auto-autoloads.el \ - $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/uim-el/auto-autoloads.el + $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/uim-el/auto-autoloads.el # replace buildroot in comments in .elc files by spaces with the same total length: RPM_BUILD_ROOT_REPLACEMENT=$(echo "$RPM_BUILD_ROOT" | tr [:print:] ' ') for i in $(find $RPM_BUILD_ROOT -name "*.elc") do - perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/xemacs/site-packages/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i - perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/emacs/site-lisp/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i + perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(%{_datadir}/xemacs/site-packages/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i + perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(%{_datadir}/emacs/site-lisp/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i done %find_lang uim %find_lang uim-chardict-qt @@ -204,9 +185,9 @@ find $RPM_BUILD_ROOT -name "*.scm" \ %post %run_ldconfig # register uim modules to uim. This will change the files: -# /usr/share/uim/installed-modules.scm -# /usr/share/uim/loader.scm -# /usr/share/uim/modules +# %{_datadir}/uim/installed-modules.scm +# %{_datadir}/uim/loader.scm +# %{_datadir}/uim/modules uim-module-manager --register pyload anthy canna skk tcode tutcode hangul viqr ipa-x-sampa latin @@ -229,13 +210,13 @@ touch var/adm/SuSEconfig/run-gtk %doc doc %dir /etc/X11/xim.d/ /etc/X11/xim.d/* -%dir /usr/share/uim +%dir %{_datadir}/uim # autogenerated by uim-module-manager: -%verify(not md5 size mtime) /usr/share/uim/installed-modules.scm -%verify(not md5 size mtime) /usr/share/uim/loader.scm -%verify(not md5 size mtime) /usr/share/uim/modules -%dir /usr/share/uim/pixmaps/ -/usr/share/uim/pixmaps/* +%ghost %{_datadir}/uim/installed-modules.scm +%ghost %{_datadir}/uim/loader.scm +%ghost %{_datadir}/uim/modules +%dir %{_datadir}/uim/pixmaps/ +%{_datadir}/uim/pixmaps/* %{_bindir}/uim-sh %{_bindir}/uim-module-manager %{_bindir}/uim-xim @@ -244,26 +225,29 @@ touch var/adm/SuSEconfig/run-gtk %{_bindir}/uim-el-agent %{_bindir}/uim-el-helper-agent %{_libdir}/*.so.* -%dir %{_libdir}/uim/ -%{_libdir}/uim/uim-helper-server -%{_libdir}/uim/uim-toolbar-applet -%{_libdir}/uim/uim-candwin-gtk +%dir %{_libdir}/uim +%if "%{_libdir}" != "%{_prefix}/lib" +%dir %{_prefix}/lib/uim +%endif +%{_prefix}/lib/uim/uim-helper-server +%{_prefix}/lib/uim/uim-toolbar-applet +%{_prefix}/lib/uim/uim-candwin-gtk %dir %{_libdir}/uim/plugin/ %{_libdir}/uim/plugin/*.so -%{_mandir}/man1/*.1.gz -/usr/share/applications/%name.desktop -/usr/share/emacs/site-lisp/* -%dir /usr/share/xemacs/site-packages/ -%dir /usr/share/xemacs/site-packages/lisp/ -%dir /usr/share/xemacs/site-packages/lisp/uim-el/ -/usr/share/xemacs/site-packages/lisp/uim-el/* +%doc %{_mandir}/man1/*.1.gz +%{_datadir}/applications/%name.desktop +%{_datadir}/emacs/site-lisp/* +%dir %{_datadir}/xemacs/site-packages/ +%dir %{_datadir}/xemacs/site-packages/lisp/ +%dir %{_datadir}/xemacs/site-packages/lisp/uim-el/ +%{_datadir}/xemacs/site-packages/lisp/uim-el/* %files -n uim-devel %defattr(-, root, root) %{_libdir}/*.*a %{_libdir}/*.so -%dir /usr/include/uim -/usr/include/uim/* +%dir %{_includedir}/uim +%{_includedir}/uim/* %{_libdir}/pkgconfig/uim.pc %files -n uim-gtk2 @@ -271,17 +255,10 @@ touch var/adm/SuSEconfig/run-gtk %{_bindir}/uim-im-switcher-gtk %{_bindir}/uim-input-pad-ja %{_bindir}/uim-toolbar-gtk +%{_bindir}/uim-toolbar-gtk-systray %{_bindir}/uim-pref-gtk -/opt/gnome/bin/* -%dir /opt/gnome/%{_lib}/bonobo/ -%dir /opt/gnome/%{_lib}/bonobo/servers/ -/opt/gnome/%{_lib}/bonobo/servers/* -%dir /opt/gnome/%{_lib}/gtk-*/ -%dir /opt/gnome/%{_lib}/gtk-*/*/ -%dir /opt/gnome/%{_lib}/gtk-*/*/immodules/ -/opt/gnome/%{_lib}/gtk-*/*/immodules/* -%dir %{_libdir}/uim/ -%{_libdir}/uim/uim-toolbar-applet +%{_libdir}/bonobo/servers/*.server +%{_libdir}/gtk-*/*/immodules/*.so %files -n uim-qt -f uim-chardict-qt.lang %defattr(-, root, root) @@ -289,16 +266,17 @@ touch var/adm/SuSEconfig/run-gtk %{_bindir}/uim-im-switcher-qt %{_bindir}/uim-pref-qt %{_bindir}/uim-toolbar-qt -%dir /usr/lib/qt3/plugins/inputmethods/ -/usr/lib/qt3/plugins/inputmethods/*.so -/usr/lib/qt3/plugins/inputmethods/*.la -%dir %{_libdir}/uim/ -%{_libdir}/uim/uim-candwin-qt -%dir /usr/share/uim/ -%dir /usr/share/uim/helperdata/ -/usr/share/uim/helperdata/bushu.t +%{_prefix}/lib/qt3/plugins/inputmethods/*.so +%{_prefix}/lib/uim/uim-candwin-qt +%dir %{_datadir}/uim/helperdata/ +%{_datadir}/uim/helperdata/bushu.t %changelog -n uim +* Fri Feb 02 2007 - sbrabec@suse.cz +- Removed references to /opt/gnome. +- Bi-arch libexecdir fix. +- Package each file only once. +- Use %%ghost for autogenerated files. * Mon Dec 25 2006 - schwab@suse.de - Fix format string bugs. - Make uim-el less chatty.