rpms/emacs-mmm/F-11 emacs-mmm-fix-compile-warnings-0.4.8.patch, NONE, 1.1 emacs-mmm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Alan Dunn
amdunn at fedoraproject.org
Mon Apr 13 10:38:53 UTC 2009
Author: amdunn
Update of /cvs/pkgs/rpms/emacs-mmm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv910/F-11
Modified Files:
.cvsignore sources
Added Files:
emacs-mmm-fix-compile-warnings-0.4.8.patch emacs-mmm.spec
import.log
Log Message:
Initial Fedora RPM.
emacs-mmm-fix-compile-warnings-0.4.8.patch:
--- NEW FILE emacs-mmm-fix-compile-warnings-0.4.8.patch ---
diff -dur mmm-mode-0.4.8.ORIG/mmm-compat.el mmm-mode-0.4.8/mmm-compat.el
--- mmm-mode-0.4.8.ORIG/mmm-compat.el 2003-03-09 10:04:03.000000000 -0700
+++ mmm-mode-0.4.8/mmm-compat.el 2009-04-08 11:21:19.000000000 -0600
@@ -65,9 +65,9 @@
(defmacro defgroup (&rest args)
nil)
(defmacro defface (var values doc &rest args)
- (` (make-face (quote (, var)))))
+ `(make-face (quote ,var)))
(defmacro defcustom (var value doc &rest args)
- (` (defvar (, var) (, value) (, doc)))))
+ `(defvar ,var ,value ,doc)))
;;}}}
;;{{{ Regexp-Opt (Emacs 19)
diff -dur mmm-mode-0.4.8.ORIG/mmm-noweb.el mmm-mode-0.4.8/mmm-noweb.el
--- mmm-mode-0.4.8.ORIG/mmm-noweb.el 2004-06-16 08:01:10.000000000 -0600
+++ mmm-mode-0.4.8/mmm-noweb.el 2009-04-08 11:22:28.000000000 -0600
@@ -154,7 +154,7 @@
nil)
(list name
(car pos-list) (cadr pos-list)))))))
- (mmm-submode-changes-in start stop t delim))))
+ (mmm-submode-changes-in start stop))))
;; The above loop leaves lots of nils in the list...
;; Removing them saves us from having to do the (last x 2)
;; trick that mmm-regions-in does.
diff -dur mmm-mode-0.4.8.ORIG/mmm-region.el mmm-mode-0.4.8/mmm-region.el
--- mmm-mode-0.4.8.ORIG/mmm-region.el 2003-06-19 05:24:04.000000000 -0600
+++ mmm-mode-0.4.8/mmm-region.el 2009-04-08 11:27:30.000000000 -0600
@@ -586,7 +586,6 @@
(ignore-errors (funcall func)))))
(defun mmm-add-hooks ()
- (make-local-hook 'post-command-hook)
(add-hook 'post-command-hook 'mmm-update-submode-region nil 'local))
(defun mmm-remove-hooks ()
diff -dur mmm-mode-0.4.8.ORIG/mmm-utils.el mmm-mode-0.4.8/mmm-utils.el
--- mmm-mode-0.4.8.ORIG/mmm-utils.el 2003-03-09 10:04:04.000000000 -0700
+++ mmm-mode-0.4.8/mmm-utils.el 2009-04-08 11:27:47.000000000 -0600
@@ -93,7 +93,7 @@
subexp)
(save-match-data
(while (string-match "~\\([0-9]\\)" string)
- (setq subexp (string-to-int (match-string-no-properties 1 string))
+ (setq subexp (string-to-number (match-string-no-properties 1 string))
string (replace-match
(save-match-data
(set-match-data old-data)
--- NEW FILE emacs-mmm.spec ---
%define pkg mmm
# Check version defaults
# If the emacs-el package has installed a pkgconfig file, use that to
# determine install locations and Emacs version at build time, otherwise
# set defaults.
%if %($(pkg-config emacs) ; echo $?)
%define emacs_version 22.1
%define emacs_lispdir %{_datadir}/emacs/site-lisp
%define emacs_startdir %{_datadir}/emacs/site-lisp/site-start.d
%else
%define emacs_version %(pkg-config emacs --modversion)
%define emacs_lispdir %(pkg-config emacs --variable sitepkglispdir)
%define emacs_startdir %(pkg-config emacs --variable sitestartdir)
%endif
Name: emacs-%{pkg}
Version: 0.4.8
Release: 1%{?dist}
Summary: Emacs minor mode allowing different major modes in the same file
Group: Applications/Editors
License: GPLv2+
URL: http://mmm-mode.sourceforge.net/
Source0: mmm-mode-%{version}.tar.gz
Patch0: emacs-mmm-fix-compile-warnings-%{version}.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: emacs, texinfo-tex
Requires: emacs(bin)
Requires(post): info
Requires(preun): info
%description
MMM Mode is an emacs add-on package providing a minor mode that allows
Multiple Major Modes to coexist in one buffer. It is particularly
well-suited to editing embedded code or code that generates other
code, such as Mason or Embperl server-side Perl code, or HTML output
by CGI scripts.
MMM Mode defines a general syntax--the "submode class"--for telling it
how one major mode should be embedded in another. At present, the list
of supplied submode classes is rather limited, but that will hopefully
change soon. Contributions are always welcome; writing a submode class
can be a good introduction to Emacs Lisp, and is usually a simple
excercise for those already proficient. MMM Mode was originally
designed to work in Emacs 19 and 20 and XEmacs 20 and 21.
This has been created as an emacs-only package as it already exists
for XEmacs in xemacs-packages-extra.
%package -n %{name}-el
Summary: Elisp source files for %{pkg} under GNU Emacs
Group: Applications/Editors
Requires: %{name} = %{version}-%{release}
%description -n %{name}-el
This package contains the elisp source files for %{pkg} under GNU
Emacs. You do not need to install this package to run %{pkg}. Install
the %{name} package to use %{pkg} with GNU Emacs.
%prep
%setup -q -n mmm-mode-%{version}
# Fix a number of compile warnings. Fixes courtesy Jerry James
# (see:
%patch0 -p1
%build
export EMACS=%{_bindir}/emacs
%configure
make
# Fix encoding with iconv for info page
mv mmm.info-2 mmm.info-2.tmp && \
iconv -f ISO-8859-1 -t UTF-8 < mmm.info-2.tmp > mmm.info-2 &&\
rm mmm.info-2.tmp
# The texinfo.tex here is stale, using it causes errors, so this will
# get the system one to be used instead
rm texinfo.tex
make mmm.pdf
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
# Fix an issue that occurs in the info files (not quite sure where in
# the process, so doing it here):
mv %{buildroot}%{_infodir}/mmm.info-2.gz \
%{buildroot}%{_infodir}/mmm.info-2 && \
gzip %{buildroot}%{_infodir}/mmm.info-2
# We don't want this either, but otherwise we need to do a more complicated
# make command
rm %{buildroot}%{_infodir}/dir
%clean
rm -rf %{buildroot}
%post
/sbin/install-info %{_infodir}/mmm.info.gz %{_infodir}/dir || :
%preun
if [ $1 = 0 ] ; then
/sbin/install-info --delete %{_infodir}/mmm.info.gz %{_infodir}/dir || :
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FAQ NEWS README README.Mason %{pkg}.pdf
%{emacs_lispdir}/*.elc
%{_infodir}/*.gz
%files -n %{name}-el
%defattr(-,root,root,-)
%{emacs_lispdir}/*.el
%changelog
* Wed Apr 08 2009 Alan Dunn <amdunn at gmail.com> 0.4.8-1
- Initial Fedora RPM.
--- NEW FILE import.log ---
emacs-mmm-0_4_8-1_fc10:F-11:emacs-mmm-0.4.8-1.fc10.src.rpm:1239618801
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 10 Apr 2009 00:16:59 -0000 1.1
+++ .cvsignore 13 Apr 2009 10:38:22 -0000 1.2
@@ -0,0 +1 @@
+mmm-mode-0.4.8.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-mmm/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 10 Apr 2009 00:16:59 -0000 1.1
+++ sources 13 Apr 2009 10:38:22 -0000 1.2
@@ -0,0 +1 @@
+5dd9e415ced923b588962efa41324de4 mmm-mode-0.4.8.tar.gz
More information about the fedora-extras-commits
mailing list