rpms/emacs/F-11 emacs.spec,1.131,1.132
Jonathan G. Underwood
jgu at fedoraproject.org
Tue Oct 13 23:42:16 UTC 2009
Author: jgu
Update of /cvs/extras/rpms/emacs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26843
Modified Files:
emacs.spec
Log Message:
* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-6
- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
- Use site_start_d macro consistently
* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
- emacs contains nxml-mode (#516391)
Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-11/emacs.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -p -r1.131 -r1.132
--- emacs.spec 29 Sep 2009 11:04:59 -0000 1.131
+++ emacs.spec 13 Oct 2009 23:42:16 -0000 1.132
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -178,7 +178,7 @@ ${TOPDIR}/src/emacs %{bytecompargs} site
# Create pkgconfig file
cat > emacs.pc << EOF
sitepkglispdir=%{site_lisp}
-sitestartdir=%{site_lisp}/site-start.d
+sitestartdir=%{site_start_d}
Name: emacs
Description: GNU Emacs text editor
@@ -188,7 +188,8 @@ EOF
# Create macros.emacs RPM macro file
cat > macros.emacs << EOF
%%_emacs_version %{version}
-%%_emacs_epoch %{epoch}
+%%_emacs_ev %{?epoch:%{epoch}:}%{version}
+%%_emacs_evr %{?epoch:%{epoch}:}%{version}-%{release}
%%_emacs_sitelispdir %{site_lisp}
%%_emacs_sitestartdir %{site_start_d}
%%_emacs_bytecompile /usr/bin/emacs %bytecompargs
@@ -381,6 +382,10 @@ alternatives --install %{_bindir}/etags
%dir %{_datadir}/emacs/%{version}
%changelog
+* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-6
+- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
+- Use site_start_d macro consistently
+
* Tue Sep 29 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-5
- emacs contains nxml-mode (#516391)
More information about the fedora-extras-commits
mailing list