Accepting request 632718 from M17N

OBS-URL: https://build.opensuse.org/request/show/632718
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anthy?expand=0&rev=32

anthy.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Sep  1 12:13:32 UTC 2018 - Ismail Dönmez <idonmez@suse.com>
+
+- Cleanup spec file with spec-cleaner
+- Don't install INSTALL file
+- Use %bcond_with{out}
+
+-------------------------------------------------------------------
+Fri Aug 31 10:19:58 UTC 2018 - qzhao@suse.com
+
+- Update anthy.spec: Divide openSUSE build with emacs function and 
+  SLE doesn't need it.
+
 -------------------------------------------------------------------
 Thu Feb  8 17:26:49 UTC 2018 - msuchanek@suse.com
 

anthy.spec

@@ -16,27 +16,19 @@
 #
 
 
+%if 0%{?is_opensuse}
+%bcond_without emacs
+%else
+%bcond_with emacs
+%endif
 Name:           anthy
-BuildRequires:  emacs-x11
-BuildRequires:  fdupes
-BuildRequires:  libtool
-BuildRequires:  xemacs
 Version:        9100h
 Release:        0
-Url:            https://osdn.jp/projects/anthy/
-Source0:        anthy-%{version}.tar.bz2
-Source1:        suse-start-anthy.el
-Source2:        baselibs.conf
-Patch2:         anthy-last-command-char-xemacs.patch
-Patch3:         bugzilla-224463-comparison-with-string-literal.patch
-# PATCH-FIX-OPENSUSE anthy-use-last-command-event.diff bnc#849211 tiwai@suse.de
-Patch4:         anthy-use-last-command-event.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        Kana-Kanji Conversion Engine
 # Summary(ja): 仮名漢字変換エンジン
 # Anthy(旧称Ancy)
-# 
+#
-# PC-Unix用の仮名漢字変換エンジンとしては Canna、 FreeWnn等が有名ですが、 
+# PC-Unix用の仮名漢字変換エンジンとしては Canna、 FreeWnn等が有名ですが、
 # いずれも1990年前後の国産Unixワークステーションのために開発され、 フリー
 # なものの開発はほぼ停止している状態です。 Hekeプロジェクトでは新たな変
 # 換エンジンを辞書を除いてフルスクラッチで 開発を行っています。
@@ -44,22 +36,36 @@ Summary:        Kana-Kanji Conversion Engine
 # 著者：
 # ------
 #     田畑 悠介 <yusuke@kmc.kyoto-u.ac.jp>
-License:        GPL-2.0+ and LGPL-2.1+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
 Group:          System/I18n/Japanese
+URL:            https://osdn.jp/projects/anthy/
+Source0:        anthy-%{version}.tar.bz2
+Source1:        suse-start-anthy.el
+Source2:        baselibs.conf
+Patch2:         anthy-last-command-char-xemacs.patch
+Patch3:         bugzilla-224463-comparison-with-string-literal.patch
+# PATCH-FIX-OPENSUSE anthy-use-last-command-event.diff bnc#849211 tiwai@suse.de
+Patch4:         anthy-use-last-command-event.diff
+BuildRequires:  fdupes
+BuildRequires:  libtool
+%if %{with emacs}
+BuildRequires:  emacs-x11
+BuildRequires:  xemacs
+%endif
 
 %description
 Anthy (previously called 'Ancy'):
 
 Canna, FreeWnn, and others are famous Kana-Kanji conversion engines
 usable for Unix on PCs. They were originally developed for Japanese
-Unix workstations around 1990 and development has practically stopped. 
+Unix workstations around 1990 and development has practically stopped.
 Therefore, the Heke Project is writing a free conversion engine from
 scratch (apart from the dictionary, which is developed outside of the
 Heke Project).
 
 %package devel
 Summary:        Include Files and Libraries mandatory for Development.
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/I18n/Japanese
 Requires:       %{name} = %{version}
 # Summary(ja): Anthy のヘッダファイル及びライブラリです。
@@ -80,8 +86,8 @@ to develop applications that require these.
 
 %build
 autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+CFLAGS="%{optflags} -fno-strict-aliasing" \
-CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+CXXFLAGS="%{optflags} -fno-strict-aliasing" \
 %configure --disable-static --with-pic
 make %{?_smp_mflags}
 
@@ -90,41 +96,42 @@ cd test
 ./anthy --all
 
 %install
-%makeinstall
+%make_install
-install -m 644 $RPM_SOURCE_DIR/suse-start-anthy.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
+%if %{with emacs}
+install -m 644 $RPM_SOURCE_DIR/suse-start-anthy.el %{buildroot}%{_datadir}/emacs/site-lisp/
 # compile the XEmacs versions of the emacs-lisp files and install them:
 pushd src-util
     rm -f *.elc
     # make EMACS=xemacs
     EMACS=xemacs ../elisp-comp *.el
-    mkdir -p $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/anthy
+    mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp/anthy
-    install -m 644 *.el *.elc $RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/anthy
+    install -m 644 *.el *.elc %{buildroot}%{_datadir}/xemacs/site-packages/lisp/anthy
 popd
-%fdupes $RPM_BUILD_ROOT/usr/share
+%endif
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+%fdupes %{buildroot}%{_datadir}
+find %{buildroot} -type f -name "*.la" -delete -print
 # remove unneeded Makefiles for documents
 rm -f doc/Makefile.*
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
+%doc AUTHORS ChangeLog DIARY NEWS README doc
-%doc AUTHORS COPYING ChangeLog DIARY INSTALL NEWS README
+%license COPYING
-%doc doc
 %config %{_sysconfdir}/anthy-conf
-%dir /usr/share/anthy/
+%dir %{_datadir}/anthy/
-/usr/share/anthy/*
+%{_datadir}/anthy/*
 %{_bindir}/*
 %{_libdir}/*.so.*
-/usr/share/emacs/site-lisp/*
+%if %{with emacs}
-/usr/share/xemacs/*
+%{_datadir}/emacs/site-lisp/*
+%{_datadir}/xemacs/*
+%endif
 
 %files devel
-%defattr(-, root, root)
+%dir %{_includedir}/anthy/
-%dir /usr/include/anthy/
+%{_includedir}/anthy/*
-/usr/include/anthy/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/anthy.pc