Browse Source

2015-04-03 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* anthy: updated patch
	* m17n-db, m17n-lib, xosview: updated
	* uim: updated spec
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9483 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
88878503c6
5 changed files with 325 additions and 252 deletions
  1. 51 42
      a/anthy/anthy-vl.spec
  2. 65 27
      m/m17n-db/m17n-db-vl.spec
  3. 92 53
      m/m17n-lib/m17n-lib-vl.spec
  4. 93 114
      u/uim/uim-vl.spec
  5. 24 16
      x/xosview/xosview-vl.spec

+ 51 - 42
a/anthy/anthy-vl.spec

@@ -12,13 +12,13 @@
 %define without_emacsen 1
 %endif
 
-%define ut_patch_date	20100517
+%define ut_patch_date	20110409
 
 Name: anthy
 Summary: A Japanese character input system library (with dictionary).
 Summary(ja): Anthy - 日本語入力システムおよび辞書
 Version: 9100h
-Release: 14%{?_dist_release}
+Release: 15%{?_dist_release}
 
 License: GPL, LGPL, BSD
 Group: Applications/System
@@ -36,12 +36,13 @@ Source100: anthy-ut-patches-%{ut_patch_date}.tar.bz2
 # http://www.fenix.ne.jp/~G-HAL/soft/nosettle/#anthy
 Patch100: anthy-9100h.patch13B-23-iconv-ucdict.2010507.alt-depgraph-100120-patch100126.alt-cannadic-091230.patch
 Patch110: anthy-9100h.patch13B-23-iconv-jisx0213.patch
-Patch120: anthy-ut-patches-20100517-ANTHY_ENCODING_EUCJP.patch
+Patch120: anthy-ut-patches-%{ut_patch_date}-ANTHY_ENCODING_EUCJP.patch
 Patch121: make-anthy.el-work-with-emacs-24.3.1.diff
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake
 BuildRequires: autoconf
+BuildRequires: nkf
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -53,22 +54,6 @@ Anthy is free and secure Japanese input system.
 %description -l ja
 Anthy はフリーでセキュアな日本語入力システムです。
 
-%if %{emacsen_pkg}
-%package -n %{anthy_el}
-Summary: Emacs-lisp frontend for Anthy
-Summary(ja): Anthy 用 Emacs-lisp フロントエンド
-Group: Applications/Editors/Emacs
-BuildRequires: emacsen
-Requires(post,preun): emacsen, emacsen-common >= 0.1
-Requires: %{name} = %{version}-%{release}
-
-%description -n %{anthy_el}
-Emacs-lisp frontend for Anthy
-
-%description -n %{anthy_el} -l ja
-Anthy のための Emacs-lisp フロントエンド
-%endif
-
 %package devel
 Summary: Development files for libanthy
 Summary(ja): libanthy を使ったアプリケーションを開発するためのファイル
@@ -83,6 +68,21 @@ Devepment files for anthy libraries.
 libanthy を利用したアプリケーションを開発するために必要なヘッダやライブラリ
 が含まれています。
 
+%if %{emacsen_pkg}
+%package -n %{anthy_el}
+Summary: Emacs-lisp frontend for Anthy
+Summary(ja): Anthy 用 Emacs-lisp フロントエンド
+Group: Applications/Editors/Emacs
+BuildRequires: emacsen
+Requires(post,preun): emacsen, emacsen-common >= 0.1
+Requires: %{name} = %{version}-%{release}
+
+%description -n %{anthy_el}
+Emacs-lisp frontend for Anthy
+
+%description -n %{anthy_el} -l ja
+Anthy の Emacs-lisp フロントエンドです。
+%endif
 
 %prep
 %setup -q -a 100
@@ -102,10 +102,18 @@ chmod a+x ./depgraph/mkdepword \
           ./calctrans/divide.sh \
           ./mkworddic/mkucdic.pl
 
+# fix file encoding
+for file in AUTHORS AUTHORS.patch DIARY NEWS README; do
+    nkf -O -w $file
+    mv nkf.out $file
+done
+
 %build
 #libtoolize --copy --force
 autoreconf -f -i
-%configure --localstatedir=%{_var}
+%configure \
+    --disable-static \
+    --localstatedir=%{_var}
 
 #%__make %{?_smp_mflags}
 # don't use smp option
@@ -114,6 +122,7 @@ autoreconf -f -i
 
 %install
 %__rm -rf ${RPM_BUILD_ROOT}
+
 %makeinstall
 %if %{emacsen_pkg}
 %__mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp/%{anthy}
@@ -135,11 +144,17 @@ autoreconf -f -i
 ## remove unuse files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
+%clean
+%__rm -rf ${RPM_BUILD_ROOT}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %if %{emacsen_pkg}
 %post -n %{anthy_el}
 if [ "$1" = 2 ]; then
-  %{?emacsen_pkg: %_emacsenPackageRemove %{anthy}}
+    %{?emacsen_pkg: %_emacsenPackageRemove %{anthy}}
 fi
 %{?emacsen_pkg: %_addemacsenlist %{anthy}}
 %{?emacsen_pkg: %_emacsenPackageInstall %{anthy}}
@@ -147,32 +162,27 @@ fi
 
 %preun -n %{anthy_el}
 if [ "$1" = 0 ]; then
-  %{?emacsen_pkg: %_emacsenPackageRemove %{anthy}}
+    %{?emacsen_pkg: %_emacsenPackageRemove %{anthy}}
 
-  %{?emacsen_pkg: %_removeemacsenlist %{anthy}}
+    %{?emacsen_pkg: %_removeemacsenlist %{anthy}}
 
 fi
 %endif
 
-
-%clean
-%__rm -rf ${RPM_BUILD_ROOT}
-
-
-%post -p /sbin/ldconfig
-
-
-%postun -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root)
+%doc AUTHORS* COPYING ChangeLog DIARY NEWS README* doc Doxyfile
 %{_bindir}/*
 %{_sysconfdir}/*
 %{_datadir}/anthy
-%{_libdir}/libanthy*.so
 %{_libdir}/libanthy*.so.*
-%doc AUTHORS COPYING ChangeLog DIARY NEWS README doc Doxyfile README.en
+
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*
+#{_libdir}/libanthy*.a
+%{_libdir}/libanthy*.so
+%{_libdir}/pkgconfig/*.pc
 
 %if %{emacsen_pkg}
 %files -n %{anthy_el}
@@ -184,14 +194,13 @@ fi
 %{emacsen_pkgdir}/remove/%{anthy}
 %endif
 
-%files devel
-%defattr(-,root,root)
-%{_includedir}/*
-%{_libdir}/libanthy*.a
-#%{_libdir}/libanthy*.la
-%{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 9100h-15
+- updated Source100 as of 20110409
+- updated Patch120
+- fixed document encodings to UTF-8
+
 * Tue Sep 16 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 9100h-14
 - fixed anthy-el packaging problem
 

+ 65 - 27
m/m17n-db/m17n-db-vl.spec

@@ -1,60 +1,98 @@
-%define ver 1.6.5
-%define rel 1
+Name:       	m17n-db
+Version:    	1.7.0
+Release:    	1%{?dist}
+Summary:	Multilingualization datafiles for m17n-lib
+Summary(ja):    m17n-lib 用の多言語化データファイル
 
-Summary: a part of the m17n database for the m17n library
-Name: m17n-db
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-Source0: %{name}-%{version}.tar.gz
-License: LGPLv2.1+
-Group: System Environment/Libraries
-URL: http://www.m17n.org/m17n-lib-ja/
-BuildArch: noarch
+License:	LGPLv2+
+Group:		System Environment/Libraries
+URL:	        http://www.nongnu.org/m17n
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: m17n-lib
-BuildRequires: glibc-common
+Source0: 	http://download-mirror.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
+## Till the Inscript2 gets upstreamed in m17n-lib, use this source
+Source1:	https://fedorahosted.org/releases/i/n/inscript2/inscript2-20120320.tar.gz
+# Following is awaiting for upstream commit
+Source2:	https://raw.githubusercontent.com/gnuman/m17n-inglish-mims/master/minglish/minglish.mim
 
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildArch:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	gettext
 
+Vendor:		Project Vine
+Distribution:	Vine Linux
 
 %description
-This package is part of the m17n database; a sub-part of the m17n
-library.
+This package contains multilingualization (m17n) datafiles for m17n-lib
+which describe input maps, encoding maps, OpenType font data and
+font layout text rendering for languages.
 
+%package devel
+Summary:  	Development files for m17n-db
+Summary(ja):  	m17n-db の開発用ファイル
+Group:		Development/Libraries
+Requires: 	%{name} = %{version}-%{release}
+
+%description devel
+m17n-db development files
 
 %prep
 %setup -q
 
+##extract inscript2 maps
+tar xzf %{SOURCE1}
+
 %build
 %configure
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
-%{makeinstall}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
-%find_lang %{name}
+# don't ship unijoy map for now
+rm $RPM_BUILD_ROOT%{_datadir}/m17n/bn-unijoy.mim
+rm $RPM_BUILD_ROOT%{_datadir}/m17n/icons/bn-unijoy.png
 
+#removing ispell.mim for rh#587927
+rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim
 
-%clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
+#install inscript2 keymaps
+pwd
+cp -p inscript2/IM/* $RPM_BUILD_ROOT%{_datadir}/m17n/
+cp -p inscript2/icons/* $RPM_BUILD_ROOT%{_datadir}/m17n/icons
+
+# install minglish keymap
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/m17n
 
+%find_lang %{name}
 
 %check
 make check
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README
-%{_bindir}/m17n*
+%doc AUTHORS COPYING README
 %{_datadir}/m17n
-%{_datadir}/pkgconfig/m17n-db.pc
 
+%files devel
+%defattr(-,root,root)
+%{_bindir}/m17n-db
+%{_datadir}/pkgconfig/m17n-db.pc
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.7.0-1
+- updated to 1.7.0
+- added SOURCE1 and SOURCE2 from Fedora
+  * Wed Feb 25 2015 Parag Nemade <pnemade AT redhat DOT com> - 1.7.0-2
+  - Added Minglish input method (rh#1191543)
+  * Wed Mar 12 2014 Parag Nemade <pnemade AT redhat DOT com> - 1.6.5-2
+  - Add missing install commands for inscript2 maps
+- split development files into devel subpackage
+  
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.5-1
 - update to 1.6.5
 

+ 92 - 53
m/m17n-lib/m17n-lib-vl.spec

@@ -1,97 +1,136 @@
-%define ver 1.6.4
-%define rel 1
-
-Summary: a multilingual text processing library for the C language
-Name: m17n-lib
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-Source0: %{name}-%{version}.tar.gz
-License: LGPLv2.1+
-Group: System Environment/Libraries
-URL: http://www.m17n.org/m17n-lib-ja/
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gd-devel
-BuildRequires: fontconfig-devel
-BuildRequires: libotf-devel
-BuildRequires: libxml2-devel
-BuildRequires: libXt-devel
+Name:           m17n-lib
+Version:        1.7.0
+Release:        1%{?_dist_release}
+Summary:        Multilingual text library
+Summary(ja):    多言語テキストライブラリ
+
+License:        LGPLv2+
+Group:		System Environment/Libraries
+URL:            http://www.nongnu.org/m17n/
+Source0:        http://download.savannah.gnu.org/releases/m17n/%{name}-%{version}.tar.gz
+Patch0:         %{name}-1.6.1-multilib.patch
+
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
+BuildRequires:	fontconfig-devel
+BuildRequires:	fribidi-devel
+BuildRequires:	gd-devel
+BuildRequires:	libotf-devel
+BuildRequires:	libthai-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	libXt-devel
+BuildRequires:	m17n-db-devel
 BuildConflicts: anthy-devel
+Requires:       m17n-db
 
-Vendor: Project Vine
-Distribution: Vine Linux
+Vendor: 	Project Vine
+Distribution:	Vine Linux
 
 
 %description
-The m17n library is a multilingual text processing library for the C
-language.
-
+m17n-lib is a multilingual text library used primarily to allow
+the input of many languages with the input table maps from m17n-db.
 
 %package devel
-Summary: Development files for the %{name} package
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Summary:	Development files for the %{name} package
+Summary(ja):	%{name} の開発用ファイル
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-tools = %{version}-%{release}
+Requires:	pkgconfig
 
 %description devel
 Development files for the %{name} package.
 
+%package  tools
+Summary:	m17n GUI Library tools
+Summary(ja):	m17n GUI ライブラリツール集
+Group:		Applications/Text
+Requires: 	m17n-db
+Requires: 	%{name} = %{version}-%{release}
+
+%description tools
+Tools to test M17n GUI widget library.
 
 %prep
 %setup -q
+%patch0 -p1
+
+mkdir -p docs_to_include
+cp -pr example docs_to_include
 
 %build
-%configure --with-fontconfig --with-gd --disable-static
-#%{__make} %{?_smp_mflags}
-## don't use smp_mflags
-%{__make}
+autoreconf -ivf
+%configure \
+    --disable-rpath \
+    --disable-static \
+    --with-fontconfig \
+    --with-gd
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+# parallel make usage with make command fails build on koji
+make
 
 %install
-%{__rm} -rf ${RPM_BUILD_ROOT}
-%{makeinstall}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # remove unused files
-%{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/m17n/1.0/libmimx-anthy.so
-%{__rm} -f ${RPM_BUILD_ROOT}%{_libdir}/m17n/1.0/libmimx-ispell.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-anthy.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/m17n/1.0/libmimx-ispell.so
 
 
 %clean
-%{__rm} -rf ${RPM_BUILD_ROOT}
-
+rm -rf $RPM_BUILD_ROOT
 
 %check
 make check
 
-
 %post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-
-%postun
-if [ "$1" = "0" ] ; then
-    /sbin/ldconfig
-fi
-
+%post tools -p /sbin/ldconfig
+%postun tools -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
-%doc COPYING ChangeLog NEWS README TODO
-%{_bindir}/m17n*
-%{_libdir}/lib*.so.0.*
-%{_libdir}/m17n/1.0/libm17n-X.so
-%{_libdir}/m17n/1.0/libm17n-gd.so
+%doc AUTHORS COPYING NEWS ChangeLog README
+%dir %{_libdir}/m17n
+%dir %{_libdir}/m17n/1.0
+%{_bindir}/m17n-conv
+%{_libdir}/libm17n.so.*
+%{_libdir}/libm17n-core.so.*
+%{_libdir}/libm17n-flt.so.*
 
 %files devel
 %defattr(-,root,root)
-%doc example
-%{_includedir}/*.h
+%doc docs_to_include/example
+%{_bindir}/m17n-config
+%{_includedir}/*
 %{_libdir}/lib*.so
-%{_libdir}/lib*.so.0
-%{_libdir}/pkgconfig/m17n*.pc
+%{_libdir}/pkgconfig/*
 
+%files tools
+%defattr(-,root,root)
+%{_bindir}/m17n-date
+%{_bindir}/m17n-dump
+%{_bindir}/m17n-edit
+%{_bindir}/m17n-view
+%{_libdir}/m17n/1.0/libm17n-X.so
+%{_libdir}/m17n/1.0/libm17n-gd.so
+%{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.7.0-1
+- update to 1.7.0
+- fixed lib*.so.? location
+- added BuildRequires: fribidi-devel, libthai-devel and m17-db-devel 
+- added Japanese summary
+- split tools into tools subpackage
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.6.4-1
 - update to 1.6.4
 - add BuildRequires: libXt-devel

+ 93 - 114
u/uim/uim-vl.spec

@@ -1,38 +1,43 @@
-# disable feature if you run rpmbuild with '--without feature'
-%define with_emacsen	%{?_without_emacsen:0}%{!?_without_emacsen:1}
-%define with_qt		%{?_without_qt:0}%{!?_without_qt:1}
-%define with_qt4	%{?_without_qt4:0}%{!?_without_qt4:1}
-#%define with_gnome	%{?_without_gnome:0}%{!?_without_gnome:1}
-%define with_gnome	0
-%define with_kde	%{?_without_kde:0}%{!?_without_kde:1}
-%define with_mana	%{?_without_mana:0}%{!?_without_mana:1}
-
-#define with_canna	%{?_without_canna:0}%{!?_without_canna:1}
-%define with_canna	0
+
+# build emacsen uim bridge ("--without emacs" to disable)
+%bcond_without emacsen
+# build qt3 immodule ("--without qt3" to disable qt3)
+%bcond_without qt3
+# build qt4 immodule ("--without qt4" to disable qt4)
+%bcond_without qt4
+# build KDE applet ("--without kde" to disable kde)
+%bcond_without kde
+# build mana support ("--without mana" to disable mana)
+%bcond_without mana
+
+# do not build GNOME applet ("--with gnome" to enable gnome)
+%bcond_with gnome
+# do not build Canna module ("--with canna" to enable canna)
+%bcond_with canna
 
 %define qt3_ver 3.3.8
-%define qt4_ver 4.8.3
-# Qt3 version auto-detection -- inagaki
+%define qt4_ver 4.8.6
+
+# Qt3 version detection
 %define _qt3_version %(pkg-config --modversion --silence-errors qt-mt 2>/dev/null || echo %{qt3_ver})
 %define _qt3_prefix  %{_libdir}/qt-%{_qt3_version}
 %define _qt3_plugindir %{_qt3_prefix}/plugins
 
-# build qt4 immodule ("--without qt4" to disable qt4)
-%bcond_without qt4
-# Qt4 version auto-detection -- inagaki
+# Qt4 version detection
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 
-#%%define extraver beta
+#define extraver beta
 
 Name: uim
 Summary: Uim an input method library
 Summary(ja): 入力メソッドライブラリ
 Version: 1.8.6
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 
-License: LGPLv2/BSD
+# pinyin-big5.scm and elatin-rules.scm are licensed under GPL
+License: BSD, LGPLv2 and GPL
 Group: System Environment/Libraries
 URL: http://code.google.com/p/uim/
 
@@ -52,24 +57,27 @@ BuildRequires: ncurses-devel
 BuildRequires: anthy-devel m17n-lib-devel eb-devel
 BuildRequires: libedit-devel libffi-devel expat-devel curl-devel
 BuildRequires: gettext-devel desktop-file-utils
-%if %{with_qt}
+%if %{with qt3}
 BuildRequires: qt-devel
 %endif
-%if %{with_qt4}
+%if %{with qt4}
 BuildRequires: qt4-devel
 %endif
-%if %{with_gnome}
+%if %{with gnome}
 BuildRequires: gnome-panel-devel
 BuildRequires: libgnomeui-devel
 %endif
-%if %{with_kde}
+%if %{with kde}
 BuildRequires: kdelibs4-devel
 BuildRequires: cmake
 %endif
-%if %{with_mana}
+%if %{with canna}
+BuildRequires: Canna-devel
+%endif
+%if %{with mana}
 BuildRequires: mana
 %endif
-%if %{with_emacsen}
+%if %{with emacsen}
 BuildRequires: emacs
 %endif
 
@@ -86,7 +94,8 @@ uim は様々な言語の入力メソッドのコレクションです。
 %package xim
 Summary: XIM frontend for Uim
 Summary(ja): uim を利用した XIM サーバ
-Group: User Interface/Desktops
+License: BSD and LGPLv2
+Group: User Interface/X
 Requires: %{name} = %{version}-%{release}
 
 %description xim
@@ -99,6 +108,7 @@ XIM 経由で入力を行う場合に必要です。
 %package gtk
 Summary: GTK helper for uim
 Summary(ja): uim の GTK ヘルパー
+License: BSD and LGPLv2
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: gtk2
@@ -117,6 +127,7 @@ input pad, candidate window, and preference tool using GTK.
 %package gtk3
 Summary: GTK3 helper for uim
 Summary(ja): uim の GTK3 ヘルパー
+License: BSD and LGPLv2
 Group: User Interface/Desktops
 Requires: %{name} = %{version}-%{release}
 Requires: gtk3
@@ -133,13 +144,14 @@ input pad, candidate window, and preference tool using GTK3.
 候補ウィンドウ、設定ツールなどが含まれています。
 
 
-%if %{with_qt}
+%if %{with qt3}
 %package qt
 Summary: Qt3 support for Uim
 Summary(ja): uim の Qt3 サポート
 Group: User Interface/Desktops
+License: BSD and LGPLv2
 Requires: %{name}-xim = %{version}-%{release}
-Requires: qt = %{_qt3_version}
+Requires: qt >= %{_qt3_version}
 
 Obsoletes: %{name}-qt-immodule < 1.5.6-2
 Obsoletes: %{name}-qt-common < %{version}-%{release}
@@ -156,13 +168,14 @@ and preference tool using Qt.
 が含まれています。
 %endif
 
-%if %{with_qt4}
+%if %{with qt4}
 %package qt4
 Summary: Qt4 support for Uim
 Summary(ja): Uim の Qt4 サポート
+License: BSD and LGPLv2
 Group: User Interface/Desktops
 Requires: %{name}-xim = %{version}-%{release}
-Requires: qt4 = %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 Obsoletes: %{name}-qt-common < %{version}-%{release}
 
 %description qt4
@@ -174,15 +187,14 @@ and preference tool using Qt4.
 が含まれています。
 %endif
 
-%if %{with_gnome}
+%if %{with gnome}
 %package applet
 Summary: GNOME panel applet for Uim
 Summary(ja): uim の GNOME 用パネルアプレット
+License: BSD and LGPLv2
 Group: User Interface/Desktops
-#BuildRequires: libgnomeui-devel
 Requires: %{name}-xim = %{version}-%{release}
 Requires: %{name}-gtk3 = %{version}-%{release}
-#Requires: libgnomeui
 
 %description applet
 uim-applet is GNOME panel applet for uim.
@@ -191,18 +203,14 @@ uim-applet is GNOME panel applet for uim.
 uim-applet は uim の入力状態を表示する GNOME 用パネルアプレットです。
 %endif
 
-%if %{with_kde}
+%if %{with kde}
 %package kde-applet
 Summary: KDE panel applet for Uim
 Summary(ja): uim の KDE 用パネルアプレット
+License: BSD and LGPLv2
 Group: User Interface/Desktops
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl4"
-Requires: kdelibs3
-Requires: %{name}-qt = %{version}-%{release}
-%else
 Requires: kdelibs4
 Requires: %{name}-qt4 = %{version}-%{release}
-%endif
 Requires: %{name}-xim = %{version}-%{release}
 
 %description kde-applet
@@ -210,27 +218,12 @@ uim-kde-applet is KDE panel applet for uim.
 
 %description -l ja kde-applet
 uim-kde-applet は uim の入力状態を表示する KDE 用パネルアプレットです。
-
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl4"
-%package kde4-applet
-Summary: KDE4 panel applet for Uim
-Summary(ja): uim の KDE4 用パネルアプレット
-Group: User Interface/Desktops
-Requires: kdelibs4
-Requires: %{name}-qt4 = %{version}-%{release}
-Requires: %{name}-xim = %{version}-%{release}
-
-%description kde4-applet
-uim-kde-applet is KDE4 panel applet for uim.
-
-%description -l ja kde4-applet
-uim-kde-applet は uim の入力状態を表示する KDE4 用パネルアプレットです。
-%endif
 %endif
 
 %package fep
 Summary: an Input Method for console
 Summary(ja): コンソール用インプットメソッド
+License: BSD
 Group: Applications/System
 Requires: %{name} = %{version}-%{release}
 Requires: ncurses
@@ -246,6 +239,7 @@ FEP (フロントエンドプロセッサ) です。
 %package anthy
 Summary: Anthy support for Uim
 Summary(ja): uim の Anthy モジュール
+License: BSD and LGPLv2
 Group: System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: anthy
@@ -260,12 +254,12 @@ This package provides support for Anthy, a Japanese input method.
 連文節かな漢字変換エンジン Anthy を使って日本語を入力・変換するための
 モジュールです。
 
-%if %{with_canna}
+%if %{with canna}
 %package canna
 Summary: Canna support for Uim
 Summary(ja): uim の Canna モジュール
+License: BSD and LGPLv2
 Group: System Environment/Libraries
-BuildRequires: Canna-devel
 Requires: %{name} = %{version}-%{release}
 Requires: Canna
 Requires(post): %{name} = %{version}-%{release}
@@ -294,12 +288,12 @@ This package provides support for SKK, a Japanese input method.
 %description -l ja skk
 SKK 入力方式で日本語を入力・変換するためのモジュールです。
 
-%if %{with_mana}
+%if %{with mana}
 %package mana
 Summary: Mana support for Uim
 Summary(ja): uim の真字モジュール
+License: BSD
 Group: System Environment/Libraries
-BuildRequires: mana
 Requires: %{name} = %{version}-%{release}
 Requires: mana, manadic
 Requires(post): %{name} = %{version}-%{release}
@@ -313,10 +307,11 @@ This package provides support for mana, a Japanese input method.
 モジュールです。
 %endif
 
-%if %{with_emacsen}
+%if %{with emacsen}
 %package el
 Summary: Emacsen uim bridge
 Summary(ja): Emacsen-uim ブリッジ
+License: BSD
 Group: Applications/Editors/Emacs
 Requires: %{name} = %{version}-%{release}
 Requires: emacsen
@@ -338,6 +333,8 @@ uim.el を導入すると、Emacsen 上で uim を利用した文字入力が可
 
 %package m17n
 Summary: m17n-lib support for Uim
+Summary(ja): uim の m17n-lib モジュール
+License: BSD
 Group: System Environment/Libraries
 Requires: uim = %{version}-%{release}
 Requires(post):	gtk2 /usr/bin/uim-module-manager
@@ -350,6 +347,7 @@ many languages using the input table map from m17n-db.
 %package devel
 Summary: Development tools for libuim applications.
 Summary(ja): libuim を使ったアプリケーションを開発するためのファイル
+License: BSD and LGPLv2
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 
@@ -366,7 +364,7 @@ uim-devel パッケージには libuim を利用したアプリケーション
 
 
 %build
-%if %{with_qt}
+%if %{with qt3}
 unset QTDIR
 export QTDIR=%{_qt3_prefix}
 %endif
@@ -382,58 +380,46 @@ export QTDIR=%{_qt3_prefix}
 	--with-ffi \
 	--with-eb --with-eb-conf=%{_sysconfdir}/eb.conf \
 	--disable-static \
-%if %{with_gnome}
+%if %{with gnome}
 	--enable-gnome3-applet \
 %else
 	--disable-gnome-applet \
 %endif
-%if %{with_qt}
+%if %{with qt3}
 	--with-qt \
 	--with-qt-immodule \
 %else
 	--without-qt \
 	--without-qt-immodule \
 %endif
-%if %{with_qt4}
+%if %{with qt4}
 	--with-qt4 \
 	--with-qt4-immodule \
 %else
 	--without-qt4 \
 	--without-qt4-immodule \
 %endif
-%if %{with_kde}
-	--enable-kde-applet \
+%if %{with kde}
+	--disable-kde-applet \
 	--enable-kde4-applet \
 %else
 	--disable-kde-applet \
 	--disable-kde4-applet \
 %endif
-%if %{with_canna}
+%if %{with canna}
 	--with-canna \
 %else
 	--without-canna \
 %endif
-%if !%{with_emacsen}
+%if %{without emacsen}
 	--disable-emacs \
 %endif
-%if %{with_mana}
+%if %{with mana}
 	--with-mana 
 %else
 	--without-mana 
 %endif
 
-# generate Makefile properly for kde4-applets (ad-hoc)
-#if %{with_kde}
-#pushd qt4/toolbar/build
-#QTDIR=%{_qt4_prefix} {cmake} \
-#    -DCMAKE_BUILD_TYPE=release \
-#    -DDATA_INSTALL_DIR:PATH=%{_datadir}/kde4/apps \
-#    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir}/kde4 \
-#    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir}/kde4 \
-#    ..
-#popd
-#endif
-
 sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
 LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs:$LD_LIBRARY_PATH make
 
@@ -465,28 +451,28 @@ make install DESTDIR=%{buildroot}
 %__rm -f %{buildroot}%{_qt3_plugindir}/inputmethods/*.{a,la}
 %__rm -f %{buildroot}%{_qt4_plugindir}/inputmethods/*.{a,la}
 
-%if ! %{with_canna}
+%if %{without canna}
 %__rm -f %{buildroot}%{_libdir}/uim/plugin/libuim-canna.so
 %__rm -f %{buildroot}%{_datadir}/uim/canna*.scm
 %__rm -f %{buildroot}%{_datadir}/uim/pixmaps/canna.*
 %endif
 
-%if ! %{with_mana}
+%if %{without mana}
 %__rm -f %{buildroot}%{_libdir}/uim/plugin/libuim-mana.so
 %__rm -f %{buildroot}%{_datadir}/uim/mana.scm
 %__rm -f %{buildroot}%{_datadir}/uim/mana-*.scm
 %__rm -f %{buildroot}%{_datadir}/uim/pixmaps/mana.*
 %endif
 
-%if ! %{with_qt}
+%if %{without qt3}
 %__rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uim-chardict-qt.mo
 %endif
 
-%if ! %{with_qt4}
+%if %{without qt4}
 %__rm -f %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/uim-chardict-qt4.mo
 %endif
 
-%if %{with_emacsen}
+%if %{with emacsen}
 %__mkdir_p %{buildroot}%{emacsen_pkgdir}/install
 %__mkdir_p %{buildroot}%{emacsen_pkgdir}/remove
 
@@ -499,9 +485,10 @@ make install DESTDIR=%{buildroot}
 %endif
 
 # move documents for sigscheme
-#%__rm -rf installed-doc
-#%__mkdir installed-doc
-#%__mv -f %{buildroot}%{_docdir}/sigscheme installed-doc/
+rm -rf installed-doc
+mkdir -p installed-doc/sigscheme
+cp -p sigscheme/doc/*.txt installed-doc/sigscheme
+cp -p sigscheme/doc/*.html installed-doc/sigscheme
 
 # script to register prefered engine
 %__cat %{SOURCE3} \
@@ -548,7 +535,7 @@ if [ $1 = 0 ] ; then
 	%{_bindir}/uim-module-manager --unregister anthy > /dev/null 2>&1
 fi
 
-%if %{with_canna}
+%if %{with canna}
 %post canna
 %{_datadir}/uim/update-installed-modules.sh --register canna > /dev/null 2>&1
 
@@ -566,7 +553,7 @@ if [ $1 = 0 ] ; then
 	%{_bindir}/uim-module-manager --unregister skk > /dev/null 2>&1
 fi
 
-%if %{with_mana}
+%if %{with mana}
 %post mana
 %{_datadir}/uim/update-installed-modules.sh --register mana > /dev/null 2>&1
 
@@ -576,7 +563,7 @@ if [ $1 = 0 ] ; then
 fi
 %endif
 
-%if %{with_emacsen}
+%if %{with emacsen}
 %post el
 if [ $1 = 2 ] ; then
 	%_emacsenPackageRemove %{name}-el
@@ -606,7 +593,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc README* ChangeLog* INSTALL* AUTHORS COPYING
+%doc  AUTHORS COPYING ChangeLog* NEWS README RELNOTE
 %config(noreplace) %{_sysconfdir}/sysconfig/uim
 %{_bindir}/uim-help
 %{_bindir}/uim-sh
@@ -617,11 +604,11 @@ fi
 %exclude %{_datadir}/uim/skk*.scm
 %exclude %{_datadir}/uim/pixmaps/anthy.*
 %exclude %{_datadir}/uim/pixmaps/skk.*
-%if %{with_canna}
+%if %{with canna}
 %exclude %{_datadir}/uim/canna*.scm
 %exclude %{_datadir}/uim/pixmaps/canna.*
 %endif
-%if %{with_mana}
+%if %{with mana}
 %exclude %{_datadir}/uim/mana.scm
 %exclude %{_datadir}/uim/mana-*.scm
 %exclude %{_datadir}/uim/pixmaps/mana.*
@@ -672,7 +659,7 @@ fi
 %{_libexecdir}/uim-candwin-tbl-gtk3
 %{_libdir}/gtk-3.0/*/immodules/*.so
 
-%if %{with_qt}
+%if %{with qt3}
 %files qt
 %defattr(-,root,root)
 # BSD and LGPLv2+
@@ -687,7 +674,7 @@ fi
 %{_qt3_plugindir}/inputmethods/*.so
 %endif
 
-%if %{with_qt4}
+%if %{with qt4}
 %files qt4
 %defattr(-,root,root)
 # BSD and LGPLv2+
@@ -702,7 +689,7 @@ fi
 %{_qt4_plugindir}/inputmethods/*.so
 %endif
 
-%if %{with_gnome}
+%if %{with gnome}
 %files applet
 %defattr(-,root,root)
 %{_libexecdir}/uim-toolbar-applet-gnome3
@@ -710,22 +697,11 @@ fi
 %{_datadir}/gnome-panel/4.0/applets/UimApplet.panel-applet
 %endif
 
-%if %{with_kde}
+%if %{with kde}
 %files kde-applet
 %defattr(-,root,root)
-%if %{?_dist_release} == "vl5" || %{?_dist_release} == "vl4"
-%{_libdir}/kde3/uim_panelapplet.*
-%{_datadir}/apps/kicker/applets/uimapplet.desktop
-
-%files kde4-applet
-%defattr(-,root,root)
-%{_libdir}/kde4/plasma_applet_uim.*
-%{_datadir}/kde4/services/plasma-applet-uim.desktop
-%else
 %{_libdir}/kde4/plasma_applet_uim.*
 %{_datadir}/kde4/services/plasma-applet-uim.desktop
-
-%endif
 %endif
 
 %files fep
@@ -741,7 +717,7 @@ fi
 %{_datadir}/uim/anthy*.scm
 %{_datadir}/uim/pixmaps/anthy.*
 
-%if %{with_canna}
+%if %{with canna}
 %files canna
 %defattr(-,root,root)
 %{_libdir}/uim/plugin/libuim-canna.so
@@ -755,7 +731,7 @@ fi
 %{_datadir}/uim/skk*.scm
 %{_datadir}/uim/pixmaps/skk.*
 
-%if %{with_mana}
+%if %{with mana}
 %files mana
 %defattr(-,root,root)
 %{_libdir}/uim/plugin/libuim-mana.so
@@ -764,7 +740,7 @@ fi
 %{_datadir}/uim/pixmaps/mana.*
 %endif
 
-%if %{with_emacsen}
+%if %{with emacsen}
 %files el
 %defattr(-,root,root)
 %doc emacs/COPYING emacs/README*
@@ -780,7 +756,6 @@ fi
 %{_bindir}/uim-m17nlib-relink-icons
 %{_libdir}/uim/plugin/libuim-m17nlib.so
 %{_datadir}/uim/m17nlib.scm
-#{_datadir}/uim/pixmaps/m17n*png
 %dir %{_datadir}/uim
 
 %files devel
@@ -792,6 +767,10 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Thu Apr  2 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.8.6-2
+- fixed Requires in qt4 subpackage
+- used bcond macros 
+
 * Sun Jul 06 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.8.6-1
 - new upstream release
 - drop %%{name}-applet subpackage

+ 24 - 16
x/xosview/xosview-vl.spec

@@ -3,24 +3,27 @@
 %define desktop_file_utils_version 0.2.90
 %endif
 
-Summary: An X Window System utility for monitoring system resources.
-Summary(ja): X Window System のシステムリソースモニタ
-Name: xosview
-Version: 1.9.2
-Release: 1%{?_dist_release}
-URL:           http://www.pogo.org.uk/~mark/xosview/
-Source0:       http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.2.tar.gz
-# An old png file is being used for the icon.  It is located at:
-Source1:       http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png
-Patch0:        xosview-1.9.2-appdef.patch
-Group: Applications/System
+Summary:	An X Window System utility for monitoring system resources.
+Summary(ja):	X Window System のシステムリソースモニタ
+Name: 		xosview
+Version: 	1.16
+Release: 	1%{?_dist_release}
+
+Group:		Applications/System
 # The netbsd/swapinternal.{cc,h} source files are BSD only (with 
 # advertising), but neither file is used in the linux version of 
 # xosview.  Instead, the source files used are linux/swapmeter.{cc,h}, 
 # both of which fall under the GPL. All other files are either GPL 
 # based, or can fall under either the BSD or GPL copyright.
 License: GPL+
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+URL:            http://www.pogo.org.uk/~mark/xosview/
+Source0:        http://www.pogo.org.uk/~mark/xosview/releases/xosview-%{version}.tar.gz
+# An old png file is being used for the icon.  It is located at:
+Source1:        http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png
+Patch0:         xosview-1.11-app-def.patch
+Patch1:         xosview-aarch64.patch
+
+Buildroot:	%{_tmppath}/%{name}-%{version}-root
 # XXX ia64 needs porting work
 ExcludeArch: alpha ia64 sparc
 
@@ -45,16 +48,17 @@ xosview は,メモリ・CPU の使用率やシステム負荷など,現在
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 
 %build
-%configure
-%{__make} %{?_smp_mflags} all
+%{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" 
 
 cat > %{name}.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
 Name=OS Resource Viewer
+Name[ja]=OS リソースビューア
 Comment=
 Exec=xosview
 Terminal=false
@@ -72,9 +76,10 @@ EOF
     %{buildroot}%{_datadir}/applications \
     %{buildroot}%{_datadir}/X11/app-defaults
 
-%{__make} install PREFIX_TO_USE=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
+%{__make} install PREFIX=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
 
 %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
+%{__install} -p -m 0644 -D Xdefaults %{buildroot}%{_datadir}/X11/app-defaults/XOsview
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 
 
@@ -84,7 +89,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES COPYING COPYING.GPL README README.linux TODO
+%doc CHANGES COPYING COPYING.GPL README README.linux TODO Xdefaults
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/icons/%{name}.png
@@ -93,6 +98,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr  3 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.16-1
+- updated to 1.16
+
 * Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.9.2-1
 - new upstream release; new upstream location
 - spec revamp based on Fedora