rpms/emacs-common-muse/devel .cvsignore, 1.8, 1.9 emacs-common-muse.spec, 1.21, 1.22 sources, 1.8, 1.9 muse-3.03-fixes.patch, 1.1, NONE

Sun Feb 3 01:23:48 UTC 2008

Author: jgu

Update of /cvs/extras/rpms/emacs-common-muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25693

Modified Files:
	.cvsignore emacs-common-muse.spec sources 
Removed Files:
	muse-3.03-fixes.patch 
Log Message:
* Sun Feb  3 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.12-1
- Update to version 3.12
- Cleanup spec file to comply with emacs add-on packaging guidelines
- Fix file encodings
- Cleanup the make install variables



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9

--- .cvsignore	25 Aug 2007 08:56:55 -0000	1.8
+++ .cvsignore	3 Feb 2008 01:23:12 -0000	1.9
@@ -1 +1 @@
-muse-3.11.tar.gz
+muse-3.12.tar.gz


Index: emacs-common-muse.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/devel/emacs-common-muse.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- emacs-common-muse.spec	25 Aug 2007 08:56:55 -0000	1.21
+++ emacs-common-muse.spec	3 Feb 2008 01:23:12 -0000	1.22
@@ -1,34 +1,52 @@
 %define pkg muse
-%define xemacs 1
+%bcond_without xemacs
 
-%define emacs_sitelisp %{_datadir}/emacs/site-lisp
-%define emacs_ver 21.4
+# 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
 
-%if %{xemacs}
-%define xemacs_sitelisp %{_datadir}/xemacs/site-packages/lisp
-%define xemacs_ver 21.4.18
+%if %{with_xemacs}
+# If the xemacs-devel package has installed a pkgconfig file, use that to
+# determine install locations and Emacs version at build time, otherwise set
+# defaults.
+%if %($(pkg-config xemacs) ; echo $?)
+%define xemacs_version 21.5
+%define xemacs_lispdir %{_datadir}/xemacs/site-lisp
+%define xemacs_startdir %{_datadir}/xemacs/site-lisp/site-start.d
+%else
+%define xemacs_version %(pkg-config xemacs --modversion)
+%define xemacs_lispdir %(pkg-config xemacs --variable sitepkglispdir)
+%define xemacs_startdir %(pkg-config xemacs --variable sitestartdir)
+%endif
 %endif
 
 Name: emacs-common-muse
-Version: 3.11
+Version: 3.12
 Release: 1%{?dist}
 Summary: Emacs Muse is an authoring and publishing environment for Emacs
 Group: Applications/Editors
 License: GPLv2+
 URL: http://www.mwolson.org/projects/MuseMode.html           
-Requires: /sbin/install-info 
 Obsoletes: muse = 3.02.6b
+Requires(pre): /sbin/install-info 
+Requires(post): /sbin/install-info 
 
 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}
+BuildRequires: emacs emacs-el
 BuildRequires: texinfo-tex
-BuildRequires: tetex-latex
-%if %{xemacs}
-BuildRequires: xemacs >= %{xemacs_ver}
-BuildRequires: xemacs-packages-extra
+BuildRequires: tex(latex)
+%if %{with_xemacs}
+BuildRequires: xemacs xemacs-devel xemacs-packages-extra
 %endif
 
 %description 
@@ -47,8 +65,8 @@
 Summary: Compiled Muse lisp files for Emacs
 Group: Applications/Editors
 Requires: %{name} = %{version}-%{release}
-Requires: emacs >= %{emacs_ver}
-Requires: tetex-latex
+Requires: emacs(bin) >= %{emacs_version}
+Requires: tex(latex)
 
 %description -n emacs-%{pkg}
 This package contains the files required to use Muse with Emacs.
@@ -61,13 +79,13 @@
 %description -n emacs-%{pkg}-el
 This package contains the source lisp files for Muse for Emacs.
 
-%if %{xemacs}
+%if %{with_xemacs}
 %package -n xemacs-%{pkg}
 Summary: Compiled Muse lisp files for XEmacs
 Group: Applications/Editors
 Requires: %{name} = %{version}-%{release}
-Requires: xemacs >= %{xemacs_ver}
-Requires: tetex-latex
+Requires: xemacs >= %{xemacs_version}
+Requires: tex(latex)
 
 %description -n xemacs-%{pkg}
 This package contains the files required to use Muse with XEmacs.
@@ -92,17 +110,14 @@
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_infodir}
 
-make install \
-  PREFIX=%{buildroot}/%{_usr} \
-  INFODIR=%{buildroot}/%{_infodir} \
-  INSTALLINFO="/sbin/install-info --infodir=%{buildroot}/%{_infodir}"
+make install DESTDIR=%{buildroot} PREFIX=%{_usr} 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
+mkdir -p %{buildroot}/%{emacs_lispdir}/site-start.d
 
 cat > muse-init.el << EOF
 ;; Load muse-mode
@@ -117,20 +132,20 @@
 (require 'muse-journal)
 EOF
 
-cp muse-init.el %{buildroot}/%{emacs_sitelisp}/site-start.d/
+cp muse-init.el %{buildroot}/%{emacs_lispdir}/site-start.d/
 
 # Xemacs files
-%if %{xemacs}
+%if %{with_xemacs}
 make clean
 make lisp contrib autoloads experimental EMACS=xemacs SITEFLAG=-no-site-file 
-make install-bin ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg}
+make install-bin ELISPDIR=%{buildroot}/%{xemacs_lispdir}/%{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})
+(cd experimental ; make install ELISPDIR=%{buildroot}/%{xemacs_lispdir}/%{pkg})
 
-mkdir -p %{buildroot}/%{xemacs_sitelisp}/site-start.d
-cp muse-init.el %{buildroot}/%{xemacs_sitelisp}/site-start.d/
+mkdir -p %{buildroot}/%{xemacs_lispdir}/site-start.d
+cp muse-init.el %{buildroot}/%{xemacs_lispdir}/site-start.d/
 %endif 
 
 # Remove info dir creating by make install
@@ -141,6 +156,11 @@
   find $i -type f -perm +111 -exec chmod -x {} \;
 done
 
+# Fix file encoding
+pushd examples/johnw
+iconv -f ISO-8859-1 -t UTF8 muse-init.el > muse-init.el.utf8 && mv muse-init.el.utf8 muse-init.el
+popd
+
 %clean
 rm -rf %{buildroot}
 
@@ -160,39 +180,45 @@
 
 %files -n emacs-%{pkg}
 %defattr(-,root,root,-)
-%{emacs_sitelisp}/%{pkg}/*.elc
-%{emacs_sitelisp}/%{pkg}/contrib/*.elc
-%{emacs_sitelisp}/%{pkg}/experimental/*.elc
-%{emacs_sitelisp}/site-start.d/muse-init.el
-%dir %{emacs_sitelisp}/%{pkg}
-%dir %{emacs_sitelisp}/%{pkg}/contrib
-%dir %{emacs_sitelisp}/%{pkg}/experimental
+%{emacs_lispdir}/%{pkg}/*.elc
+%{emacs_lispdir}/%{pkg}/contrib/*.elc
+%{emacs_lispdir}/%{pkg}/experimental/*.elc
+%{emacs_lispdir}/site-start.d/muse-init.el
+%dir %{emacs_lispdir}/%{pkg}
+%dir %{emacs_lispdir}/%{pkg}/contrib
+%dir %{emacs_lispdir}/%{pkg}/experimental
 
 %files -n emacs-%{pkg}-el
 %defattr(-,root,root,-)
-%{emacs_sitelisp}/%{pkg}/*.el
-%{emacs_sitelisp}/%{pkg}/experimental/*.el
-%{emacs_sitelisp}/%{pkg}/contrib/*.el
+%{emacs_lispdir}/%{pkg}/*.el
+%{emacs_lispdir}/%{pkg}/experimental/*.el
+%{emacs_lispdir}/%{pkg}/contrib/*.el
 
-%if %{xemacs}
+%if %{with_xemacs}
 %files -n xemacs-%{pkg}
 %defattr(-,root,root,-)
-%{xemacs_sitelisp}/%{pkg}/*.elc
-%{xemacs_sitelisp}/%{pkg}/contrib/*.elc
-%{xemacs_sitelisp}/%{pkg}/experimental/*.elc
-%{xemacs_sitelisp}/site-start.d/muse-init.el
-%dir %{xemacs_sitelisp}/%{pkg}
-%dir %{xemacs_sitelisp}/%{pkg}/contrib
-%dir %{xemacs_sitelisp}/%{pkg}/experimental
+%{xemacs_lispdir}/%{pkg}/*.elc
+%{xemacs_lispdir}/%{pkg}/contrib/*.elc
+%{xemacs_lispdir}/%{pkg}/experimental/*.elc
+%{xemacs_lispdir}/site-start.d/muse-init.el
+%dir %{xemacs_lispdir}/%{pkg}
+%dir %{xemacs_lispdir}/%{pkg}/contrib
+%dir %{xemacs_lispdir}/%{pkg}/experimental
 
 %files -n xemacs-%{pkg}-el
 %defattr(-,root,root,-)
-%{xemacs_sitelisp}/%{pkg}/*.el
-%{xemacs_sitelisp}/%{pkg}/contrib/*.el
-%{xemacs_sitelisp}/%{pkg}/experimental/*.el
+%{xemacs_lispdir}/%{pkg}/*.el
+%{xemacs_lispdir}/%{pkg}/contrib/*.el
+%{xemacs_lispdir}/%{pkg}/experimental/*.el
 %endif
 
 %changelog
+* Sun Feb  3 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.12-1
+- Update to version 3.12
+- Cleanup spec file to comply with emacs add-on packaging guidelines
+- Fix file encodings
+- Cleanup the make install variables
+
 * Sat Aug 25 2007 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.11-1
 - Update to version 3.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-common-muse/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	25 Aug 2007 08:56:55 -0000	1.8
+++ sources	3 Feb 2008 01:23:12 -0000	1.9
@@ -1 +1 @@
-cf8fe880ade0fb96ad1f273444968729  muse-3.11.tar.gz
+dd465db1e2b4866dbb76c0f1d31227d7  muse-3.12.tar.gz


--- muse-3.03-fixes.patch DELETED ---


