rpms/emacs-common-muse/devel .cvsignore, 1.4, 1.5 emacs-common-muse.spec, 1.11, 1.12 sources, 1.4, 1.5
Jonathan G. Underwood (jgu)
fedora-extras-commits at redhat.com
Fri Dec 29 00:45:40 UTC 2006
Author: jgu
Update of /cvs/extras/rpms/emacs-common-muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31927
Modified Files:
.cvsignore emacs-common-muse.spec sources
Log Message:
Update to version 3.02.93
Some spec file cleanups
Update the BuildRequires to pull in xemacs-packages-extra
Add BuildRequires texinfo-tex so that the QuickStart.pdf file is built
Add scripts directory to main package
Build autoload and contrib files for xemacs package
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Aug 2006 21:42:49 -0000 1.4
+++ .cvsignore 29 Dec 2006 00:45:10 -0000 1.5
@@ -1 +1 @@
-muse-3.02.92.tar.gz
+muse-3.02.93.tar.gz
Index: emacs-common-muse.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/devel/emacs-common-muse.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- emacs-common-muse.spec 28 Aug 2006 00:02:29 -0000 1.11
+++ emacs-common-muse.spec 29 Dec 2006 00:45:10 -0000 1.12
@@ -10,34 +10,37 @@
%endif
Name: emacs-common-muse
-Version: 3.02.92
-Release: 5%{?dist}
+Version: 3.02.93
+Release: 1%{?dist}
Summary: Emacs Muse is an authoring and publishing environment for Emacs
Group: Applications/Editors
License: GPL
URL: http://www.mwolson.org/projects/MuseMode.html
+Requires: /sbin/install-info
+Obsoletes: muse = 3.02.6b
+
BuildArch: noarch
Source0: http://download.gna.org/muse-el/%{pkg}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: emacs >= %{emacs_ver}, texinfo
-Requires: /sbin/install-info
-Obsoletes: muse = 3.02.6b
+BuildRequires: emacs >= %{emacs_ver}
+BuildRequires: texinfo-tex
%if %{xemacs}
BuildRequires: xemacs >= %{xemacs_ver}
+BuildRequires: xemacs-packages-extra
%endif
%description
-Muse is an authoring and publishing environment for (X)Emacs. It simplifies the
-process of writings documents and publishing them to various output
-formats. Muse uses a very simple Wiki-like format as input. Muse consists of
-two main parts: an enhanced text-mode for authoring documents and navigating
-within Muse projects, and a set of publishing styles for generating different
-kinds of output.
+Muse is an authoring and publishing environment for (X)Emacs. It
+simplifies the process of writings documents and publishing them to
+various output formats. Muse uses a very simple Wiki-like format as
+input. Muse consists of two main parts: an enhanced text-mode for
+authoring documents and navigating within Muse projects, and a set of
+publishing styles for generating different kinds of output.
This package contains the files common to both the Emacs and XEmacs
-installations of Muse. You need to install either (or both) of emacs-%{pkg} and
-xemacs-%{pkg} to use Muse.
+installations of Muse. You need to install either (or both) of
+emacs-%{pkg} and xemacs-%{pkg} to use Muse.
%package -n emacs-%{pkg}
Summary: Compiled Muse lisp files for Emacs
@@ -83,8 +86,8 @@
%setup -q -n %{pkg}-%{version}
%build
-#Note that %{_smp_mflags} causes make to hang sometimes here.
-make all muse.html
+# Note that %{_smp_mflags} causes make to hang sometimes here.
+make all doc examples experimental
%install
rm -rf %{buildroot}
@@ -95,6 +98,10 @@
INFODIR=%{buildroot}/%{_infodir} \
INSTALLINFO="/sbin/install-info --infodir=%{buildroot}/%{_infodir}"
+# This shouldn't be necessary, but currently the package makefiles don't
+# install the compiled lisp files
+(cd experimental ; make install PREFIX=%{buildroot}/%{_usr})
+
# Create startup file.
mkdir -p %{buildroot}/%{emacs_sitelisp}/site-start.d
@@ -116,8 +123,13 @@
# Xemacs files
%if %{xemacs}
make clean
-make lisp EMACS=xemacs SITEFLAG=-no-site-file
+make lisp contrib autoloads experimental EMACS=xemacs SITEFLAG=-no-site-file
make install-bin ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg}
+
+# This shouldn't be necessary, but currently the package makefiles don't
+# install the compiled lisp files
+(cd experimental ; make install ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg})
+
mkdir -p %{buildroot}/%{xemacs_sitelisp}/site-start.d
cp muse-init.el %{buildroot}/%{xemacs_sitelisp}/site-start.d/
%endif
@@ -126,8 +138,9 @@
rm -f %{buildroot}/usr/share/info/dir
# Fix files we package as documentation to not be executeable
-find examples -type f -perm +111 -exec chmod -x {} \;
-find contrib/pyblosxom -type f -perm +111 -exec chmod -x {} \;
+for i in examples contrib/pyblosxom scripts ; do
+ find $i -type f -perm +111 -exec chmod -x {} \;
+done
%clean
rm -rf %{buildroot}
@@ -142,13 +155,15 @@
%files
%defattr(-,root,root,-)
-%doc README NEWS AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 examples muse.html contrib/pyblosxom
+%doc README NEWS AUTHORS ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3
+%doc examples muse.html contrib/pyblosxom scripts
%doc %{_infodir}/*
%files -n emacs-%{pkg}
%defattr(-,root,root,-)
%{emacs_sitelisp}/%{pkg}/*.elc
%{emacs_sitelisp}/%{pkg}/contrib/*.elc
+%{emacs_sitelisp}/%{pkg}/experimental/*.elc
%dir %{emacs_sitelisp}/%{pkg}
%{emacs_sitelisp}/site-start.d/muse-init.el
@@ -163,17 +178,26 @@
%defattr(-,root,root,-)
%{xemacs_sitelisp}/%{pkg}/*.elc
%{xemacs_sitelisp}/%{pkg}/contrib/*.elc
+%{xemacs_sitelisp}/%{pkg}/experimental/*.elc
%dir %{xemacs_sitelisp}/%{pkg}
%{xemacs_sitelisp}/site-start.d/muse-init.el
%files -n xemacs-%{pkg}-el
%defattr(-,root,root,-)
%{xemacs_sitelisp}/%{pkg}/*.el
-%{xemacs_sitelisp}/%{pkg}/experimental/*.el
%{xemacs_sitelisp}/%{pkg}/contrib/*.el
+%{xemacs_sitelisp}/%{pkg}/experimental/*.el
%endif
%changelog
+* Fri Dec 29 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.93-1
+- Update to version 3.02.93
+- Some spec file cleanups
+- Update the BuildRequires to pull in xemacs-packages-extra
+- Add BuildRequires texinfo-tex so that the QuickStart.pdf file is built
+- Add scripts directory to main package
+- Build autoload and contrib files for xemacs package
+
* Mon Aug 28 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.92-5
- Fix up ChangeLog.[1-3] references in doc
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Aug 2006 21:42:49 -0000 1.4
+++ sources 29 Dec 2006 00:45:10 -0000 1.5
@@ -1 +1 @@
-addae650b66f6c12b512e80df7354ae2 muse-3.02.92.tar.gz
+aa38d0e0dde88e9898f8cfd73cd0e45f muse-3.02.93.tar.gz
More information about the fedora-extras-commits
mailing list