Hello community,
here is the log from the commit of package anthy for openSUSE:Factory checked
in at 2018-09-04 22:56:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/anthy (Old)
and /work/SRC/openSUSE:Factory/.anthy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "anthy"
Tue Sep 4 22:56:04 2018 rev:32 rq:632718 version:9100h
Changes:
--------
--- /work/SRC/openSUSE:Factory/anthy/anthy.changes 2018-02-10
17:59:29.561253233 +0100
+++ /work/SRC/openSUSE:Factory/.anthy.new/anthy.changes 2018-09-04
22:56:06.300987570 +0200
@@ -1,0 +2,13 @@
+Sat Sep 1 12:13:32 UTC 2018 - Ismail Dönmez <idon...@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 - qz...@suse.com
+
+- Update anthy.spec: Divide openSUSE build with emacs function and
+ SLE doesn't need it.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ anthy.spec ++++++
--- /var/tmp/diff_new_pack.BwKmAc/_old 2018-09-04 22:56:06.748989100 +0200
+++ /var/tmp/diff_new_pack.BwKmAc/_new 2018-09-04 22:56:06.752989114 +0200
@@ -16,22 +16,14 @@
#
+%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 ti...@suse.de
-Patch4: anthy-use-last-command-event.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Kana-Kanji Conversion Engine
# Summary(ja): 仮名漢字変換エンジン
# Anthy(旧称Ancy)
@@ -44,8 +36,22 @@
# 著者：
# ------
# 田畑 悠介 <yus...@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 ti...@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'):
@@ -59,7 +65,7 @@
%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 @@
%build
autoreconf --force --install
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+CFLAGS="%{optflags} -fno-strict-aliasing" \
+CXXFLAGS="%{optflags} -fno-strict-aliasing" \
%configure --disable-static --with-pic
make %{?_smp_mflags}
@@ -90,41 +96,42 @@
./anthy --all
%install
-%makeinstall
-install -m 644 $RPM_SOURCE_DIR/suse-start-anthy.el
$RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
+%make_install
+%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
- install -m 644 *.el *.elc
$RPM_BUILD_ROOT/usr/share/xemacs/site-packages/lisp/anthy
+ mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp/anthy
+ install -m 644 *.el *.elc
%{buildroot}%{_datadir}/xemacs/site-packages/lisp/anthy
popd
-%fdupes $RPM_BUILD_ROOT/usr/share
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+%endif
+%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 COPYING ChangeLog DIARY INSTALL NEWS README
-%doc doc
+%doc AUTHORS ChangeLog DIARY NEWS README doc
+%license COPYING
%config %{_sysconfdir}/anthy-conf
-%dir /usr/share/anthy/
-/usr/share/anthy/*
+%dir %{_datadir}/anthy/
+%{_datadir}/anthy/*
%{_bindir}/*
%{_libdir}/*.so.*
-/usr/share/emacs/site-lisp/*
-/usr/share/xemacs/*
+%if %{with emacs}
+%{_datadir}/emacs/site-lisp/*
+%{_datadir}/xemacs/*
+%endif
%files devel
-%defattr(-, root, root)
-%dir /usr/include/anthy/
-/usr/include/anthy/*
+%dir %{_includedir}/anthy/
+%{_includedir}/anthy/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/anthy.pc
