rpms/emacs-common-muse/FC-5 .cvsignore, 1.2, 1.3 emacs-common-muse.spec, 1.3, 1.4 sources, 1.2, 1.3
Jonathan G. Underwood (jgu)
fedora-extras-commits at redhat.com
Fri Dec 29 01:00:27 UTC 2006
Author: jgu
Update of /cvs/extras/rpms/emacs-common-muse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32145
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-sumo
Add BuildRequires texinfo 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/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 22 May 2006 21:26:50 -0000 1.2
+++ .cvsignore 29 Dec 2006 00:59:57 -0000 1.3
@@ -1 +1 @@
-muse-3.02.6b.tar.gz
+muse-3.02.93.tar.gz
Index: emacs-common-muse.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/emacs-common-muse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-common-muse.spec 22 May 2006 22:10:30 -0000 1.3
+++ emacs-common-muse.spec 29 Dec 2006 00:59:57 -0000 1.4
@@ -10,34 +10,37 @@
%endif
Name: emacs-common-muse
-Version: 3.02.6b
-Release: 6%{?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
%if %{xemacs}
BuildRequires: xemacs >= %{xemacs_ver}
+BuildRequires: xemacs-sumo
%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
@@ -125,6 +137,11 @@
# Remove info dir creating by make install
rm -f %{buildroot}/usr/share/info/dir
+# Fix files we package as documentation to not be executeable
+for i in examples contrib/pyblosxom scripts ; do
+ find $i -type f -perm +111 -exec chmod -x {} \;
+done
+
%clean
rm -rf %{buildroot}
@@ -138,33 +155,75 @@
%files
%defattr(-,root,root,-)
-%doc README NEWS AUTHORS ChangeLog ChangeLog.2004 ChangeLog.main examples muse.html
+%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
%files -n emacs-%{pkg}-el
%defattr(-,root,root,-)
%{emacs_sitelisp}/%{pkg}/*.el
+%{emacs_sitelisp}/%{pkg}/experimental/*.el
+%{emacs_sitelisp}/%{pkg}/contrib/*.el
%if %{xemacs}
%files -n xemacs-%{pkg}
%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}/contrib/*.el
+%{xemacs_sitelisp}/%{pkg}/experimental/*.el
%endif
%changelog
-* Mon May 22 2006 Jonathan G. Underwood <rpmb at renton.wunderspud> - 3.02.6b-5
+* 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-sumo
+- Add BuildRequires texinfo 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
+
+* Sun Aug 27 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.92-2
+- Fix erroneous setup directory (remove -n)
+
+* Sun Aug 27 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.92-1
+- Update to 3.02.92 (3.03 RC2)
+
+* Thu Jun 8 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.91-4
+- Package experimental and contrib files
+- Ensure all doc files are non-executable
+- Fix up doc files
+
+* Thu Jun 8 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.91-3
+- Correct directory name in setup
+
+* Thu Jun 8 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.91-2
+- Bump release
+- Correct email addresses in changelog entries
+
+* Thu Jun 8 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.91-1
+- Update package to latest development release
+- Re-enable XEmacs build
+
+* Mon May 22 2006 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.02.6b-5
- Rename package to emacs-common-muse
* Sun Apr 23 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 3.02.6b-4
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 22 May 2006 21:26:50 -0000 1.2
+++ sources 29 Dec 2006 00:59:57 -0000 1.3
@@ -1 +1 @@
-98fd1e6f5e6211f375561705854d4809 muse-3.02.6b.tar.gz
+aa38d0e0dde88e9898f8cfd73cd0e45f muse-3.02.93.tar.gz
More information about the fedora-extras-commits
mailing list