Accepting request 836457 from home:qzhao:branches:M17N

Update ibus.spec: Drop the is_opensuse macro to eliminate the difference between SLE-15 and openSUSE-Leap (jsc#SLE-12100).

OBS-URL: https://build.opensuse.org/request/show/836457
OBS-URL: https://build.opensuse.org/package/show/M17N/anthy?expand=0&rev=40

anthy.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 15 06:18:12 UTC 2020 - Cliff Zhao <qzhao@suse.com>
+
+- Update anthy.spec: Drop the is_opensuse macro to eliminate the
+  difference between SLE-15 and openSUSE-Leap (jsc#SLE-12100). 
+
 -------------------------------------------------------------------
 Tue Aug 18 11:19:51 UTC 2020 - Dr. Werner Fink <werner@suse.de>
 

anthy.spec

@@ -16,11 +16,6 @@
 #
 
 
-%if 0%{?is_opensuse}
-%bcond_without emacs
-%else
-%bcond_with emacs
-%endif
 Name:           anthy
 Version:        9100h
 Release:        0
@@ -47,12 +42,10 @@ 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
 Patch5:         bugzilla-1175274-emacs-27.1.patch
+BuildRequires:  emacs-x11
 BuildRequires:  fdupes
 BuildRequires:  libtool
-%if %{with emacs}
-BuildRequires:  emacs-x11
 BuildRequires:  xemacs
-%endif
 
 %description
 Anthy is a package for an input method editor backend for Unix-like
@@ -102,7 +95,6 @@ cd test
 
 %install
 %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
@@ -112,7 +104,6 @@ pushd src-util
     mkdir -p %{buildroot}%{_datadir}/xemacs/site-packages/lisp/anthy
     install -m 644 *.el *.elc %{buildroot}%{_datadir}/xemacs/site-packages/lisp/anthy
 popd
-%endif
 %fdupes %{buildroot}%{_datadir}
 find %{buildroot} -type f -name "*.la" -delete -print
 # remove unneeded Makefiles for documents
@@ -128,10 +119,8 @@ rm -f doc/Makefile.*
 %dir %{_datadir}/anthy/
 %{_datadir}/anthy/*
 %{_bindir}/*
-%if %{with emacs}
 %{_datadir}/emacs/site-lisp/*
 %{_datadir}/xemacs/*
-%endif
 
 %files -n libanthy0
 %{_libdir}/*.so.*