rpms/emacs/F-12 emacs.spec,1.139,1.140
Jonathan G. Underwood
jgu at fedoraproject.org
Tue Oct 13 23:34:24 UTC 2009
Author: jgu
Update of /cvs/extras/rpms/emacs/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25337
Modified Files:
emacs.spec
Log Message:
* Wed Oct 14 2009 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:23.1-10
- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
- Use site_start_d macro consistently
* Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
- use xdg-open(1) for opening URLs (#316131)
Index: emacs.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs/F-12/emacs.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -p -r1.139 -r1.140
--- emacs.spec 24 Sep 2009 09:44:20 -0000 1.139
+++ emacs.spec 13 Oct 2009 23:34:20 -0000 1.140
@@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs
Epoch: 1
Version: 23.1
-Release: 9%{?dist}
+Release: 10%{?dist}
License: GPLv3+
URL: http://www.gnu.org/software/emacs/
Group: Applications/Editors
@@ -180,7 +180,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
@@ -190,7 +190,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
@@ -378,6 +379,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-10
+- Update macros.xemacs to treat epoch correctly and be consistent with xemacs package
+- Use site_start_d macro consistently
+
* Thu Sep 24 2009 Daniel Novotny <dnovotny at redhat.com> 1:23.1-9
- use xdg-open(1) for opening URLs (#316131)
More information about the fedora-extras-commits
mailing list