Hello community,
here is the log from the commit of package uim for openSUSE:Factory
checked in at Mon Jan 17 18:41:09 CET 2011.
--------
--- uim/uim.changes 2010-02-01 13:36:08.000000000 +0100
+++ uim/uim.changes 2011-01-14 16:44:31.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Jan 14 15:43:54 UTC 2011 - coolo@novell.com
+
+- fix build and ran spec-cleaner
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ uim.spec ++++++
--- /var/tmp/diff_new_pack.6akco4/_old 2011-01-17 18:39:27.000000000 +0100
+++ /var/tmp/diff_new_pack.6akco4/_new 2011-01-17 18:39:27.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package uim (Version 1.5.6)
+# spec file for package uim
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,29 +15,36 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: uim
-BuildRequires: anthy-devel canna-devel emacs-x11 gcc-c++ intltool
-BuildRequires: gnome-panel-devel gtk2-devel libgnomeui-devel
-BuildRequires: ncurses-devel perl-XML-Parser pkg-config update-desktop-files
-BuildRequires: emacs-x11 xemacs
+BuildRequires: anthy-devel
+BuildRequires: canna-devel
+BuildRequires: emacs-x11
+BuildRequires: emacs-x11
+BuildRequires: gcc-c++
+BuildRequires: gnome-panel-devel
+BuildRequires: intltool
BuildRequires: libexpat-devel
-BuildRequires: qt3-devel
+BuildRequires: libgnomeui-devel
BuildRequires: libqt4-devel
-%if %suse_version > 1020
+BuildRequires: ncurses-devel
+BuildRequires: perl-XML-Parser
+BuildRequires: pkg-config
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: qt3-devel
+BuildRequires: update-desktop-files
+BuildRequires: xemacs
+%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
+Version: 1.5.6
+Release: 10
# xorg-x11-libXdmcp-devel libgnomeprintui-devel
License: GPLv2+
-Group: System/I18n/Japanese
-AutoReqProv: on
-PreReq: %{_bindir}/touch
-Provides: locale(xorg-x11:ja)
-Version: 1.5.6
-Release: 3
+Summary: A multilingual input method library
Url: http://uim.freedesktop.org/wiki/
+Group: System/I18n/Japanese
# svn co http://freedesktop.org:8080/svn/uim/trunk
# Source0: http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2
# freedesktop svn archive is broken. Currently there is an snapshot of
@@ -51,43 +58,25 @@
Patch1: qt-build.patch
Patch10: uim-sigscheme-build-fixes.diff
Patch11: uim-gnome-build-fixes.diff
+PreReq: %{_bindir}/touch
+Provides: locale(xorg-x11:ja)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Summary: A multilingual input method library
%description
Uim is a multilingual input method library. Uim's project goal is to
provide secure and useful input method for all languages. Currently, it
can input to applications which support gtk+'s immodule or XIM.
-
-
-Authors:
---------
- TOKUNAGA Hiroyuki
- Masahito Omote
- Yusuke Tabata
- Yamaken
- NOKUBI Takatsugu
-
%package devel
License: GPLv2+
Summary: Include Files and Libraries mandatory for Development
Group: System/I18n/Japanese
-Requires: %{name} = %{version} glibc-devel
+Requires: %{name} = %{version}
+Requires: glibc-devel
%description devel
Include Files and Libraries mandatory for Development.
-
-
-Authors:
---------
- TOKUNAGA Hiroyuki
- Masahito Omote
- Yusuke Tabata
- Yamaken
- NOKUBI Takatsugu
-
%package gtk2
License: GPLv2+
Summary: Control applet using gnome2
@@ -100,16 +89,6 @@
%description gtk2
Control applet using gnome2
-
-
-Authors:
---------
- TOKUNAGA Hiroyuki
- Masahito Omote
- Yusuke Tabata
- Yamaken
- NOKUBI Takatsugu
-
%package qt
License: GPLv2+
Summary: Qt3 input module plugin for uim
@@ -120,13 +99,6 @@
%description qt
Qt3 input module plugin for uim
-
-
-Authors:
---------
- Kazuki Ohta
- Yamaken
-
%package qt4
License: GPLv2+
Summary: Qt4 input module plugin for uim
@@ -138,27 +110,20 @@
%description qt4
Qt4 input module plugin for uim
-
-
-Authors:
---------
- Kazuki Ohta
- Yamaken
-
%prep
%setup0 -q
%patch1 -p1
%patch10 -p1
-%if %suse_version >= 1110
+%if 0%{?suse_version} >= 1110
%patch11 -p1
%endif
cp emacs/README README.emacs
iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
%build
-libtoolize --force --copy
-autoreconf --force --install
-intltoolize --force -c --automake
+autoreconf -f -i
+intltoolize --force
+cp po/Makefile.in.in qt/chardict/po
%configure --disable-static --with-pic \
--libexecdir=%{_prefix}/lib/uim \
--without-m17nlib\
@@ -169,65 +134,65 @@
--with-qt4-immodule \
--with-libedit
# --disable-scm-nested-eval --enable-callback-queue\
-make %{?jobs:-j %jobs}
+make %{?_smp_mflags}
%install
-%makeinstall
-rm -f $RPM_BUILD_ROOT%{_includedir}/gcroots.h
-rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gcroots.pc
+%make_install
+rm -f %{buildroot}%{_includedir}/gcroots.h
+rm -f %{buildroot}%{_libdir}/pkgconfig/gcroots.pc
# 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%{_datadir}/uim/modules
-mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/ja
+touch %{buildroot}%{_datadir}/uim/modules
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ja
install -m 644 $RPM_SOURCE_DIR/etc-x11-xim.d-uim \
- $RPM_BUILD_ROOT/etc/X11/xim.d/uim
-pushd $RPM_BUILD_ROOT/etc/X11/xim.d/ja
+ %{buildroot}%{_sysconfdir}/X11/xim.d/uim
+pushd %{buildroot}%{_sysconfdir}/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%{_datadir}/emacs/site-lisp/
-pushd $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/uim-el
+install -m 644 $RPM_SOURCE_DIR/suse-start-uim.el %{buildroot}%{_datadir}/emacs/site-lisp/
+pushd %{buildroot}%{_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%{_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
+mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp/uim-el
+install -m 644 emacs/*.el %{buildroot}%{_datadir}/xemacs/site-packages/lisp/uim-el
+pushd %{buildroot}%{_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%{_datadir}/xemacs/site-packages/lisp/uim-el/auto-autoloads.el
+ %{buildroot}%{_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")
+BUILD_ROOT_REPLACEMENT=$(echo %{buildroot} | tr [:print:] ' ')
+for i in $(find %{buildroot} -name "*.elc")
do
- 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
+ perl -pi -e "s|(;;; from file )%{buildroot}(%{_datadir}/xemacs/site-packages/.*)|\1BUILD_ROOT_REPLACEMENT\2|" $i
+ perl -pi -e "s|(;;; from file )%{buildroot}(%{_datadir}/emacs/site-lisp/.*)|\1BUILD_ROOT_REPLACEMENT\2|" $i
done
%find_lang uim
-%if %suse_version > 1100
+%if 0%{?suse_version} > 1100
touch uim-chardict-qt.lang
%else
%find_lang uim-chardict-qt
%endif
%suse_update_desktop_file uim System SystemSetup
-find $RPM_BUILD_ROOT -name "*.scm" \
+find %{buildroot} -name "*.scm" \
| grep -E -v "installed-modules.scm|loader.scm" \
- | sort | uniq | perl -p -e "s|$RPM_BUILD_ROOT||" >> uim.lang
-%if %suse_version > 1020
-%fdupes $RPM_BUILD_ROOT/usr/share
+ | sort | uniq | perl -p -e "s|%{buildroot}||" >> uim.lang
+%if 0%{?suse_version} > 1020
+%fdupes %{buildroot}%{_prefix}/share
%endif
-find %{buildroot} -type f -name "*.la" -exec %{__rm} -fv {} +
+find %{buildroot} -type f -name "*.la" -delete -print
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
/sbin/ldconfig
@@ -237,8 +202,7 @@
# %{_datadir}/uim/modules
uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode hangul viqr ipa-x-sampa latin
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
%post gtk2
# trigger run of SuSEconfig.gtk2 to register/unregister this input module
@@ -254,8 +218,8 @@
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog INSTALL* NEWS* README*
%doc doc
-%dir /etc/X11/xim.d/
-/etc/X11/xim.d/*
+%dir %{_sysconfdir}/X11/xim.d/
+%{_sysconfdir}/X11/xim.d/*
%dir %{_datadir}/uim
%dir %{_datadir}/uim/lib
# autogenerated by uim-module-manager:
@@ -282,7 +246,7 @@
%dir %{_libdir}/uim/plugin/
%{_libdir}/uim/plugin/*.so
%doc %{_mandir}/man1/*.1.gz
-%{_datadir}/applications/%name.desktop
+%{_datadir}/applications/%{name}.desktop
%{_datadir}/emacs/site-lisp/*
%dir %{_datadir}/xemacs/site-packages/
%dir %{_datadir}/xemacs/site-packages/lisp/
@@ -292,8 +256,7 @@
%files -n uim-devel
%defattr(-, root, root)
%{_libdir}/*.so
-%dir %{_includedir}/uim
-%{_includedir}/uim/*
+%{_includedir}/uim/
%{_libdir}/pkgconfig/uim.pc
%files -n uim-gtk2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org