rpms/emacs-common-muse/F-12 emacs-common-muse.spec, 1.24, 1.25 sources, 1.9, 1.10
Jonathan G. Underwood
jgu at fedoraproject.org
Tue Feb 9 02:01:18 UTC 2010
Author: jgu
Update of /cvs/pkgs/rpms/emacs-common-muse/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28613
Modified Files:
emacs-common-muse.spec sources
Log Message:
* Tue Feb 8 2010 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.20-1
- Update to version 3.20
- Modify spec file to use (X)Emacs packaging macros
Index: emacs-common-muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-muse/F-12/emacs-common-muse.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- emacs-common-muse.spec 24 Jul 2009 22:03:52 -0000 1.24
+++ emacs-common-muse.spec 9 Feb 2010 02:01:18 -0000 1.25
@@ -1,36 +1,9 @@
%define pkg muse
%bcond_without xemacs
-# 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 %{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.12
-Release: 3%{?dist}
+Version: 3.20
+Release: 1%{?dist}
Summary: Emacs Muse is an authoring and publishing environment for Emacs
Group: Applications/Editors
License: GPLv2+
@@ -65,7 +38,7 @@ emacs-%{pkg} and xemacs-%{pkg} to use Mu
Summary: Compiled Muse lisp files for Emacs
Group: Applications/Editors
Requires: %{name} = %{version}-%{release}
-Requires: emacs(bin) >= %{emacs_version}
+Requires: emacs(bin) >= %{_emacs_version}
Requires: tex(latex)
%description -n emacs-%{pkg}
@@ -84,7 +57,7 @@ This package contains the source lisp fi
Summary: Compiled Muse lisp files for XEmacs
Group: Applications/Editors
Requires: %{name} = %{version}-%{release}
-Requires: xemacs >= %{xemacs_version}
+Requires: xemacs >= %{_xemacs_version}
Requires: tex(latex)
%description -n xemacs-%{pkg}
@@ -117,7 +90,7 @@ make install DESTDIR=%{buildroot} PREFIX
(cd experimental ; make install PREFIX=%{buildroot}/%{_usr})
# Create startup file.
-mkdir -p %{buildroot}/%{emacs_lispdir}/site-start.d
+mkdir -p %{buildroot}/%{_emacs_sitestartdir}
cat > muse-init.el << EOF
;; Load muse-mode
@@ -132,20 +105,20 @@ cat > muse-init.el << EOF
(require 'muse-journal)
EOF
-cp muse-init.el %{buildroot}/%{emacs_lispdir}/site-start.d/
+cp muse-init.el %{buildroot}/%{_emacs_sitestartdir}/site-start.d/
# Xemacs files
%if %{with_xemacs}
make clean
make lisp contrib autoloads experimental EMACS=xemacs SITEFLAG=-no-site-file
-make install-bin ELISPDIR=%{buildroot}/%{xemacs_lispdir}/%{pkg}
+make install-bin ELISPDIR=%{buildroot}/%{_xemacs_sitelispdir}/%{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_lispdir}/%{pkg})
+(cd experimental ; make install ELISPDIR=%{buildroot}/%{_xemacs_sitelispdir}/%{pkg})
-mkdir -p %{buildroot}/%{xemacs_lispdir}/site-start.d
-cp muse-init.el %{buildroot}/%{xemacs_lispdir}/site-start.d/
+mkdir -p %{buildroot}/%{_xemacs_sitestartdir}
+cp muse-init.el %{buildroot}/%{_xemacs_sitestartdir}
%endif
# Remove info dir creating by make install
@@ -180,39 +153,43 @@ fi
%files -n emacs-%{pkg}
%defattr(-,root,root,-)
-%{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
+%{_emacs_sitelispdir}/%{pkg}/*.elc
+%{_emacs_sitelispdir}/%{pkg}/contrib/*.elc
+%{_emacs_sitelispdir}/%{pkg}/experimental/*.elc
+%{_emacs_sitelispdir}/site-start.d/muse-init.el
+%dir %{_emacs_sitelispdir}/%{pkg}
+%dir %{_emacs_sitelispdir}/%{pkg}/contrib
+%dir %{_emacs_sitelispdir}/%{pkg}/experimental
%files -n emacs-%{pkg}-el
%defattr(-,root,root,-)
-%{emacs_lispdir}/%{pkg}/*.el
-%{emacs_lispdir}/%{pkg}/experimental/*.el
-%{emacs_lispdir}/%{pkg}/contrib/*.el
+%{_emacs_sitelispdir}/%{pkg}/*.el
+%{_emacs_sitelispdir}/%{pkg}/experimental/*.el
+%{_emacs_sitelispdir}/%{pkg}/contrib/*.el
%if %{with_xemacs}
%files -n xemacs-%{pkg}
%defattr(-,root,root,-)
-%{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
+%{_xemacs_sitelispdir}/%{pkg}/*.elc
+%{_xemacs_sitelispdir}/%{pkg}/contrib/*.elc
+%{_xemacs_sitelispdir}/%{pkg}/experimental/*.elc
+%{_xemacs_sitelispdir}/site-start.d/muse-init.el
+%dir %{_xemacs_sitelispdir}/%{pkg}
+%dir %{_xemacs_sitelispdir}/%{pkg}/contrib
+%dir %{_xemacs_sitelispdir}/%{pkg}/experimental
%files -n xemacs-%{pkg}-el
%defattr(-,root,root,-)
-%{xemacs_lispdir}/%{pkg}/*.el
-%{xemacs_lispdir}/%{pkg}/contrib/*.el
-%{xemacs_lispdir}/%{pkg}/experimental/*.el
+%{_xemacs_sitelispdir}/%{pkg}/*.el
+%{_xemacs_sitelispdir}/%{pkg}/contrib/*.el
+%{_xemacs_sitelispdir}/%{pkg}/experimental/*.el
%endif
%changelog
+* Tue Feb 8 2010 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 3.20-1
+- Update to version 3.20
+- Modify spec file to use (X)Emacs packaging macros
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs-common-muse/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 3 Feb 2008 01:23:12 -0000 1.9
+++ sources 9 Feb 2010 02:01:18 -0000 1.10
@@ -1 +1 @@
-dd465db1e2b4866dbb76c0f1d31227d7 muse-3.12.tar.gz
+aa43de43f4437e7979ffbb708180b2e9 muse-3.20.tar.gz
More information about the scm-commits
mailing list