From 327231c08544dec0c95d709a20e994ea8a836c1ff047623bfe34ad1813f6c5bb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 3 Feb 2010 20:16:37 +0000 Subject: [PATCH 1/4] Accepting request 31039 from home:jengelh:baselibs Copy from home:jengelh:baselibs/uim via accept of submit request 31039 revision 2. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/31039 OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=9 --- ready | 0 uim.spec | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 ready diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/uim.spec b/uim.spec index 61b1f24..9785806 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim (Version 1.5.6) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -30,13 +30,13 @@ BuildRequires: libqt4-devel BuildRequires: fdupes %endif # xorg-x11-libXdmcp-devel libgnomeprintui-devel -License: GPLv2+ +License: GPL v2 or later Group: System/I18n/Japanese AutoReqProv: on PreReq: %{_bindir}/touch Provides: locale(xorg-x11:ja) Version: 1.5.6 -Release: 3 +Release: 2 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 @@ -47,7 +47,7 @@ Source0: http://uim.freedesktop.org/releases/uim-%{version}.tar.bz2 Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim -Source4: baselibs.conf +Source4: baselibs.conf Patch1: qt-build.patch Patch10: uim-sigscheme-build-fixes.diff Patch11: uim-gnome-build-fixes.diff @@ -70,7 +70,7 @@ Authors: NOKUBI Takatsugu %package devel -License: GPLv2+ +License: GPL v2 or later Summary: Include Files and Libraries mandatory for Development Group: System/I18n/Japanese Requires: %{name} = %{version} glibc-devel @@ -89,7 +89,7 @@ Authors: NOKUBI Takatsugu %package gtk2 -License: GPLv2+ +License: GPL v2 or later Summary: Control applet using gnome2 Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -111,7 +111,7 @@ Authors: NOKUBI Takatsugu %package qt -License: GPLv2+ +License: GPL v2 or later Summary: Qt3 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -128,7 +128,7 @@ Authors: Yamaken %package qt4 -License: GPLv2+ +License: GPL v2 or later Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} From 4dfc6dd8154e6da29e74bb9dac93b1ba32a3f945df0eb36f844777561589f265 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 4 Feb 2010 10:27:03 +0000 Subject: [PATCH 2/4] checked in (request 31520) OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=10 --- uim.changes | 5 ----- uim.spec | 1 - 2 files changed, 6 deletions(-) diff --git a/uim.changes b/uim.changes index 27b0638..cc08b7e 100644 --- a/uim.changes +++ b/uim.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Feb 1 12:36:04 UTC 2010 - jengelh@medozas.de - -- package baselibs.conf - ------------------------------------------------------------------- Tue Sep 15 22:55:28 UTC 2009 - crrodriguez@novell.com diff --git a/uim.spec b/uim.spec index 9785806..4a4eaf4 100644 --- a/uim.spec +++ b/uim.spec @@ -47,7 +47,6 @@ Source0: http://uim.freedesktop.org/releases/uim-%{version}.tar.bz2 Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim -Source4: baselibs.conf Patch1: qt-build.patch Patch10: uim-sigscheme-build-fixes.diff Patch11: uim-gnome-build-fixes.diff From 1a272748dc4186a8d2d316ca944b1c97cd162592985bb26f6052c839d0c7883d Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 19 Feb 2010 15:45:27 +0000 Subject: [PATCH 3/4] converted link to branch OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=11 --- uim.changes | 5 +++++ uim.spec | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/uim.changes b/uim.changes index cc08b7e..27b0638 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 1 12:36:04 UTC 2010 - jengelh@medozas.de + +- package baselibs.conf + ------------------------------------------------------------------- Tue Sep 15 22:55:28 UTC 2009 - crrodriguez@novell.com diff --git a/uim.spec b/uim.spec index 4a4eaf4..61b1f24 100644 --- a/uim.spec +++ b/uim.spec @@ -1,7 +1,7 @@ # # spec file for package uim (Version 1.5.6) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -30,13 +30,13 @@ BuildRequires: libqt4-devel BuildRequires: fdupes %endif # xorg-x11-libXdmcp-devel libgnomeprintui-devel -License: GPL v2 or later +License: GPLv2+ Group: System/I18n/Japanese AutoReqProv: on PreReq: %{_bindir}/touch Provides: locale(xorg-x11:ja) Version: 1.5.6 -Release: 2 +Release: 3 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 @@ -47,6 +47,7 @@ Source0: http://uim.freedesktop.org/releases/uim-%{version}.tar.bz2 Source1: suse-start-uim.el Source2: xemacs-auto-autoloads.el Source3: etc-x11-xim.d-uim +Source4: baselibs.conf Patch1: qt-build.patch Patch10: uim-sigscheme-build-fixes.diff Patch11: uim-gnome-build-fixes.diff @@ -69,7 +70,7 @@ Authors: NOKUBI Takatsugu %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: System/I18n/Japanese Requires: %{name} = %{version} glibc-devel @@ -88,7 +89,7 @@ Authors: NOKUBI Takatsugu %package gtk2 -License: GPL v2 or later +License: GPLv2+ Summary: Control applet using gnome2 Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -110,7 +111,7 @@ Authors: NOKUBI Takatsugu %package qt -License: GPL v2 or later +License: GPLv2+ Summary: Qt3 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} @@ -127,7 +128,7 @@ Authors: Yamaken %package qt4 -License: GPL v2 or later +License: GPLv2+ Summary: Qt4 input module plugin for uim Group: System/I18n/Japanese Requires: %{name} = %{version} From f9a48c5c66ff5f32e5b7ea31201fccf808efb6274199d129e37d1f3941210ea8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 14 Jan 2011 15:44:32 +0000 Subject: [PATCH 4/4] - fix build and ran spec-cleaner OBS-URL: https://build.opensuse.org/package/show/M17N/uim?expand=0&rev=12 --- ready | 0 uim.changes | 5 ++ uim.spec | 155 ++++++++++++++++++++-------------------------------- 3 files changed, 64 insertions(+), 96 deletions(-) delete mode 100644 ready diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/uim.changes b/uim.changes index 27b0638..f3f98c0 100644 --- a/uim.changes +++ b/uim.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jan 14 15:43:54 UTC 2011 - coolo@novell.com + +- fix build and ran spec-cleaner + ------------------------------------------------------------------- Mon Feb 1 12:36:04 UTC 2010 - jengelh@medozas.de diff --git a/uim.spec b/uim.spec index 61b1f24..4e3d1e2 100644 --- a/uim.spec +++ b/uim.spec @@ -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 -# 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 +# xorg-x11-libXdmcp-devel libgnomeprintui-devel +License: GPLv2+ +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 @@ Source4: baselibs.conf 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 @@ Provides: locale(gnome-libs:ja) %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 @@ Provides: locale(qt3:ja) %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 @@ Provides: locale(libqt4:ja) %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 @@ intltoolize --force -c --automake --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 -# this file is generated by "uim-module-manager". +%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 @@ rm -rf $RPM_BUILD_ROOT # %{_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 @@ touch var/adm/SuSEconfig/run-gtk %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 @@ touch var/adm/SuSEconfig/run-gtk %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 @@ touch var/adm/SuSEconfig/run-gtk %files -n uim-devel %defattr(-, root, root) %{_libdir}/*.so -%dir %{_includedir}/uim -%{_includedir}/uim/* +%{_includedir}/uim/ %{_libdir}/pkgconfig/uim.pc %files -n uim-gtk2