commit bbd8200db9bb680962e58674000a808dda1ca0d4067ba594cbc4b3619fb889f9 Author: Marguerite Su Date: Mon Oct 27 15:47:58 2014 +0000 Accepting request 258536 from home:MargueriteSu:branches:M17N rename from "apel" package and fix build for factory OBS-URL: https://build.opensuse.org/request/show/258536 OBS-URL: https://build.opensuse.org/package/show/M17N/emacs-apel?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch b/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch new file mode 100644 index 0000000..84a1c0a --- /dev/null +++ b/apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch @@ -0,0 +1,27 @@ +Subject: Fix wrong type argument on Emacs 24.3.50 to check make-temp-file +From: Tatsuya Kinoshita +Bug-Debian: http://bugs.debian.org/718765 + +diff --git a/ChangeLog b/ChangeLog +index 8e96224..9505b2e 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -0,0 +1,5 @@ ++2013-08-05 Tatsuya Kinoshita ++ ++ * poe.el: Fix wrong type argument on Emacs 24.3.50 to check ++ `make-temp-file'. ++ +diff --git a/poe.el b/poe.el +index be52847..b381f90 100644 +--- a/poe.el ++++ b/poe.el +@@ -1667,7 +1667,7 @@ See `walk-windows' for the meaning of MINIBUF and FRAME." + ))) + ;; arglist: (prefix &optional dir-flag suffix) + (cond +- ((not arglist) ++ ((or (not arglist) (not (listp arglist))) + ;; `make-temp-file' is a built-in; expects 3-args. + (put 'make-temp-file 'defun-maybe '3-args)) + ((> (length arglist) 3) diff --git a/apel-10.8.tar.gz b/apel-10.8.tar.gz new file mode 100644 index 0000000..31760d3 --- /dev/null +++ b/apel-10.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a511cc36bb51dc32b4915c9e03c67a994060b3156ceeab6fafa0be7874b9ccfe +size 126326 diff --git a/emacs-apel.changes b/emacs-apel.changes new file mode 100644 index 0000000..d26c43b --- /dev/null +++ b/emacs-apel.changes @@ -0,0 +1,90 @@ +------------------------------------------------------------------- +Mon Oct 27 15:43:07 UTC 2014 - i@marguerite.su + +- fix for factory + * added apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch + * Fix wrong type argument on Emacs 24.3.50 to check make-temp-file + +------------------------------------------------------------------- +Wed Jul 4 08:41:07 UTC 2012 - werner@suse.de + +- updated to version 10.8: + * EMU-ELS (emu-modules): Add setting for GNU Emacs 23 or later. + * invisible.el: In GNU Emacs 23, inv-19.el overrides builtin + function `invisible-p'. To fix the bug, require `inv-23' when + running with GNU Emacs 23 or later. + * poe.el (format-time-string): Fix problem on GNU Emacs 22.2 +- Add patch from Debian: + * poem-e20.el (fontset-pixel-size): Don't cause an error. Workaround + for Emacs 23. + +------------------------------------------------------------------- +Sat Sep 17 11:24:18 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Wed Aug 19 16:58:28 CEST 2009 - tiwai@suse.de + +- updated to version 10.7: + Updated for newer FLIM and WL; See ChangeLog file for details + +------------------------------------------------------------------- +Wed Jan 25 21:45:44 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Sat Feb 14 01:30:16 CET 2004 - mfabian@suse.de + +- update to 10.6 + +------------------------------------------------------------------- +Mon Jun 23 15:50:39 CEST 2003 - schwab@suse.de + +- Package is noarch. + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Tue Mar 20 17:24:58 CET 2001 - kukuk@suse.de + +- Fix Requires (emacs-nox -> emacs_program) + +------------------------------------------------------------------- +Mon Mar 19 10:23:54 CET 2001 - ke@suse.de + +- Add suse-start-apel.el. + +------------------------------------------------------------------- +Mon Mar 19 09:33:55 CET 2001 - ke@suse.de + +- Update to version 10.3 [#6736]. +- Remove LC_CTYPE=ISO-8859-1 and EMACS_UNIBYTE=1. +- Use RPM macros. + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Thu Sep 9 12:15:28 CEST 1999 - bs@suse.de + +- fixed call of Check at the end of %install section + +------------------------------------------------------------------- +Thu Apr 15 12:32:26 CEST 1999 - werner@suse.de + +- Add export LC_CTYPE=ISO-8859-1 and export EMACS_UNIBYTE=1 + to build *and* install section + +------------------------------------------------------------------- +Sun Sep 6 16:45:47 MEST 1998 - ke@suse.de + +- initial package: version 8.17. + diff --git a/emacs-apel.spec b/emacs-apel.spec new file mode 100644 index 0000000..b9f387e --- /dev/null +++ b/emacs-apel.spec @@ -0,0 +1,67 @@ +# +# spec file for package emacs-apel +# +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: emacs-apel +Version: 10.8 +Release: 0 +Summary: A Portable Emacs Library +License: GPL-2.0+ +Group: Productivity/Editors/Emacs +Url: http://git.chise.org/elisp/apel +Source: http://git.chise.org/elisp/dist/apel/apel-%{version}.tar.gz +Source1: suse-start-apel.el +Patch0: prevent-fontset-error.patch +# PATCH-FIX-UPSTREAM +Patch1: apel-10.8-040_make-temp-file-for-Emacs-24.3.50.patch +BuildRequires: emacs-nox +Requires: emacs +Requires: emacs_program +Provides: apel = %{version} +Obsoletes: apel < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch + +%description +A Portable Emacs Library + +%prep +%setup -q -n apel-%{version} +%patch0 -p1 +%if 0%{?suse_version} > 1310 +%patch1 -p1 +%endif +cp -p %{SOURCE1} . +iconv -fiso2022jp -tutf-8 README.ja > README.ja.new +mv README.ja.new README.ja + +%build +make "CFLAGS=%{optflags}" LDFLAGS=-s EMACS=emacs PREFIX=%{_prefix} %{?_smp_mflags} + +%install +make install EMACS=emacs PREFIX=%{buildroot}%{_prefix} +install -m 644 suse-start-apel.el %{buildroot}%{_datadir}/emacs/site-lisp/ +# make install.man + +%files +%defattr(-,root,root) +%doc README.en README.ja ChangeLog +%config %{_datadir}/emacs/site-lisp/suse-start-apel.el +%{_datadir}/emacs/site-lisp/emu +%{_datadir}/emacs/site-lisp/apel + +%changelog diff --git a/prevent-fontset-error.patch b/prevent-fontset-error.patch new file mode 100644 index 0000000..c5b375a --- /dev/null +++ b/prevent-fontset-error.patch @@ -0,0 +1,27 @@ +Description: Prevent an error of fontset-pixel-size for Emacs 23. +Bug-Debian: http://bugs.debian.org/477177 +Author: Tatsuya Kinoshita + + * poem-e20.el (fontset-pixel-size): Don't cause an error. Workaround + for Emacs 23. + +--- apel-10.7+0.20080906.orig/poem-e20.el ++++ apel-10.7+0.20080906/poem-e20.el +@@ -25,6 +25,7 @@ + ;;; Code: + + (defun fontset-pixel-size (fontset) ++ (condition-case nil + (let* ((info (fontset-info fontset)) + (height (aref info 1)) + ) +@@ -32,7 +33,8 @@ + ((string-match "-\\([0-9]+\\)-" fontset) + (string-to-number + (substring fontset (match-beginning 1)(match-end 1)))) +- (t 0)))) ++ (t 0))) ++ (error 0))) + + + ;;; @ character set diff --git a/suse-start-apel.el b/suse-start-apel.el new file mode 100644 index 0000000..f573eec --- /dev/null +++ b/suse-start-apel.el @@ -0,0 +1,7 @@ +;; /usr/share/emacs/site-lisp/suse-start-apel.el + +(add-to-list 'load-path "/usr/share/emacs/site-lisp/apel") +(add-to-list 'load-path "/usr/share/emacs/site-lisp/emu") +;; (require 'apel) + +;; /usr/share/emacs/site-lisp/suse-start-apel.el ends here