rpms/emacs/devel emacs.spec,1.95,1.96

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon May 21 20:20:18 UTC 2007


Author: coldwell

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19469

Modified Files:
	emacs.spec 
Log Message:
* Mon May 21 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.990-1
- new pretest tarball from FSF
- removed Ulrich Drepper's patch to prevent mmapped pages during dumping
  removed BuildRequires: glibc >= 2.5.90-22
  (bug traced to glibc Resolves: bz239344)
- fix alternatives removal scriptlet (Resolves: bz239745)

* Thu May 17 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.99-4
- format of freed blocks changed between glibc 2.5.90-21 and 2.5.90-22
- BuildRequires: glibc >= 2.5.90-22 (Ulrich Drepper)




Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- emacs.spec	16 May 2007 18:34:20 -0000	1.95
+++ emacs.spec	21 May 2007 20:20:15 -0000	1.96
@@ -6,8 +6,8 @@
 
 Summary: GNU Emacs text editor
 Name: emacs
-Version: 22.0.99
-Release: 3%{?dist}
+Version: 22.0.990
+Release: 1%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -30,7 +30,6 @@
 Source16: po-mode-auto-replace-date-71264.patch
 Source20: igrep.el
 Source21: igrep-init.el
-Patch0: emacs-mmap.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
@@ -104,8 +103,6 @@
 rm -f lisp/play/tetris.el
 %endif
 
-%patch0 -p1 -z .mmap
-
 # install rest of site-lisp files
 ( cd site-lisp
   cp %SOURCE2 %SOURCE4 %SOURCE5 %SOURCE6 %SOURCE9 %SOURCE14 %SOURCE20 .
@@ -184,16 +181,24 @@
 %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
 
 %post
-alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80
+if [ $1 -ge 1 ] ; then
+    alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80
+fi
 
 %preun
-alternatives --remove emacs %{_bindir}/emacs-%{version}
+if [ $1 -eq 0 ] ; then
+    alternatives --remove emacs %{_bindir}/emacs-%{version}
+fi
 
 %post nox
-alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
+if [ $1 -ge 1 ] ; then
+    alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
+fi
 
 %preun nox
-alternatives --remove emacs %{_bindir}/emacs-%{version}-nox
+if [ $1 -eq 0 ] ; then
+    alternatives --remove emacs %{_bindir}/emacs-%{version}-nox
+fi
 
 %post common
 for f in %{info_files}; do
@@ -243,13 +248,23 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Mon May 21 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.990-1
+- new pretest tarball from FSF
+- removed Ulrich Drepper's patch to prevent mmapped pages during dumping
+  removed BuildRequires: glibc >= 2.5.90-22
+  (bug traced to glibc Resolves: bz239344)
+- fix alternatives removal scriptlet (Resolves: bz239745)
+
+* Thu May 17 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.99-4
+- format of freed blocks changed between glibc 2.5.90-21 and 2.5.90-22
+- BuildRequires: glibc >= 2.5.90-22 (Ulrich Drepper)
+
 * Sun May 13 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.99-2
-- prevent mmapped pages during dumping (Ulrich Drepper)
-- Resolves: bz239344
+- prevent mmapped pages during dumping (Ulrich Drepper Resolves: bz239344)
 
 * Tue Apr 24 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.99-1
 - new (last?) pretest tarball from FSF
-- update to php-mode-1.2.0 (Ville Skyttä #235941)
+- update to php-mode-1.2.0 (Ville Skyttä Resolves: bz235941)
 - use /etc/alternatives instead of wrapper script
 
 * Tue Mar  6 2007 Chip Coldwell <coldwell at redhat.com> - 22.0.95-1




More information about the fedora-cvs-commits mailing list