Accepting request 19012 from M17N

Copy from M17N/ddskk based on submit request 19012 from user tiwai

OBS-URL: https://build.opensuse.org/request/show/19012
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ddskk?expand=0&rev=5

ddskk.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 27 11:20:45 UTC 2009 - aj@suse.de
+
+- Use xemacs-packages instead of apel-xemacs as requirement.
+- Disable building for xemacs for now since the current xemacs does
+  not byte-compile everything.
+
 -------------------------------------------------------------------
 Tue Dec 04 18:25:31 CET 2007 - mfabian@suse.de
 

ddskk.spec

@@ -19,14 +19,19 @@
 
 
 Name:           ddskk
-BuildRequires:  apel-xemacs compface emacs-x11 flim flim-xemacs giflib-devel krb5 libpng-devel libtiff-devel openldap2-devel semi-xemacs w3m xorg-x11-devel
+# Current version does not build with current xemacs, disable for now
+%define use_xemacs 0
+BuildRequires:  compface emacs-x11 flim giflib-devel krb5 libpng-devel libtiff-devel openldap2-devel w3m xorg-x11-devel
+%if %use_xemacs
+BuildRequires:  flim-xemacs semi-xemacs xemacs-packages
+%endif
 License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
 Requires:       emacs, apel, skkdic
 AutoReqProv:    on
 Provides:       locale(emacs:ja)
 Version:        20050123
-Release:        266
+Release:        267
 Url:            http://openlab.jp/skk/index.html
 Source0:        http://openlab.jp/skk/maintrunk/ddskk-20050123.tar.bz2
 Source1:        suse-start.el
@@ -71,10 +76,12 @@ Authors:
     Tsukamoto Tetsuo  <czkmt@remus.dti.ne.jp>
     Masahiko Sato <masahiko@kuis.kyoto-u.ac.jp>
 
+%if %use_xemacs
+
 %package -n ddskk-xemacs
 License:        GPL v2 or later
 Group:          Productivity/Editors/Emacs
-Requires:       xemacs, apel-xemacs, skkdic
+Requires:       xemacs, xemacs-packages, skkdic
 Provides:       locale(xemacs:ja)
 Summary:        SKK (`Simple Kana to Kanji conversion program') for XEmacs
 
@@ -90,6 +97,7 @@ Authors:
     NAKAJIMA Mikio <minakaji@osaka.email.ne.jp>
     Tsukamoto Tetsuo  <czkmt@remus.dti.ne.jp>
     Masahiko Sato <masahiko@kuis.kyoto-u.ac.jp>
+%endif
 
 %package -n skkdic
 License:        GPL v2 or later
@@ -97,7 +105,7 @@ Group:          System/I18n/Japanese
 Provides:       locale(scim-skk:ja)
 PreReq:         info
 Url:            http://openlab.jp/skk/dic.html
-Summary:        main dictionary for SKK
+Summary:        Main Dictionary for SKK
 
 %description -n skkdic
 main dictionary for SKK
@@ -172,6 +180,7 @@ make PREFIX=$RPM_BUILD_ROOT/usr \
   echo ";; %{emacs_sitelisp_dir}/suse-start-%{name}.el ends here"
 } > %{buildroot}%{emacs_sitelisp_dir}/suse-start-%{name}.el
 ######################################################################
+%if %use_xemacs
 # now build for XEmacs:
 %define xemacs_package_dir /usr/share/xemacs/site-packages/
 make clean
@@ -191,8 +200,6 @@ make PREFIX=$RPM_BUILD_ROOT/usr \
      EMACS=xemacs \
      install-package
 gzip $RPM_BUILD_ROOT%{xemacs_package_dir}/info/skk*.info*
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT/%{xemacs_package_dir}/info/dir 
 # I would be wasteful if XEmacs had it's own copy of the dictionaries
 # and some other files. The whole %{xemacs_package_dir}/etc/skk
 # can be shared with Emacs.
@@ -201,6 +208,13 @@ ln -s /usr/share/skk $RPM_BUILD_ROOT%{xemacs_package_dir}/etc/skk
 # the info pages are in the skkdic package to be able to share them
 # for Emacs and XEmacs:
 rm -f $RPM_BUILD_ROOT%{xemacs_package_dir}/info/skk*
+# 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")
+do
+    perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/xemacs/site-packages/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i
+done
+%endif
 # remove buildroot in .el files:
 for i in $(find $RPM_BUILD_ROOT -name "*.el")
 do
@@ -211,12 +225,8 @@ do
         touch ${i}c
     fi
 done
-# replace buildroot in comments in .elc files by spaces with the same total length:
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-RPM_BUILD_ROOT_REPLACEMENT=$(echo "$RPM_BUILD_ROOT" | tr [:print:] ' ')
+rm -f $RPM_BUILD_ROOT/%{xemacs_package_dir}/info/dir 
-for i in $(find $RPM_BUILD_ROOT -name "*.elc")
-do
-    perl -pi -e "s|(;;; from file )$RPM_BUILD_ROOT(/usr/share/xemacs/site-packages/.*)|\1$RPM_BUILD_ROOT_REPLACEMENT\2|" $i
-done
 
 %post -n skkdic
 for i in skk
@@ -238,6 +248,7 @@ done
 %{emacs_package_dir}
 %config %{emacs_sitelisp_dir}/suse-start-%{name}.el
 %{_infodir}/*
+%if %use_xemacs
 
 %files -n ddskk-xemacs
 %defattr(-,root,root)
@@ -247,6 +258,7 @@ done
 %dir %{xemacs_package_dir}/etc/
 %{xemacs_package_dir}/lisp/*
 %{xemacs_package_dir}/etc/*
+%endif
 
 %files -n skkdic
 %defattr(-,root,root)
@@ -271,19 +283,3 @@ done
 /usr/share/skk/NICOLA-SKK.tut
 
 %changelog
-* Tue Dec 04 2007 mfabian@suse.de
-- remove openldap2 from BuildRequires.
-* Wed Mar 01 2006 mfabian@suse.de
-- add "Provides: locale(...)".
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Jan 10 2006 mfabian@suse.de
-- bugzilla #141756: add a workaround to make the package build.
-* Thu Jan 27 2005 mfabian@suse.de
-- move info pages to skkdic subpackage and delete the copy
-  of the info pages in the XEmacs package directory to same some
-  space. On top of that the copy in the XEmacs package directory
-  was broken, texinfo.el could not format it correctly, the copy
-  produced by the Emacs build is correct.
-* Thu Jan 27 2005 mfabian@suse.de
-- new package: ddskk, version 20050123.