rpms/xemacs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xemacs.spec, 1.25, 1.26 xemacs-21.5.25-find-paths-pkgdir.patch, 1.1, NONE xemacs-21.5.26-maximize.patch, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Tue May 16 19:16:36 UTC 2006


Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7084

Modified Files:
	.cvsignore sources xemacs.spec 
Removed Files:
	xemacs-21.5.25-find-paths-pkgdir.patch 
	xemacs-21.5.26-maximize.patch 
Log Message:
* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-1
- 21.5.27, maximize patch included upstream.
- Drop no longer needed find-paths patch.
- Fix alternatives setup.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Apr 2006 16:27:53 -0000	1.5
+++ .cvsignore	16 May 2006 19:16:36 -0000	1.6
@@ -1 +1 @@
-xemacs-21.5.26.tar.gz
+xemacs-21.5.27.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Apr 2006 16:27:53 -0000	1.5
+++ sources	16 May 2006 19:16:36 -0000	1.6
@@ -1 +1 @@
-e0cd4521e8857a16f6cd675bb4c1039b  xemacs-21.5.26.tar.gz
+c415348d58eb18a9f4ed57d97e2acc62  xemacs-21.5.27.tar.gz


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xemacs.spec	7 May 2006 20:36:57 -0000	1.25
+++ xemacs.spec	16 May 2006 19:16:36 -0000	1.26
@@ -19,8 +19,8 @@
 %define xver    %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
 
 Name:           xemacs
-Version:        21.5.26
-Release:        5%{?dist}
+Version:        21.5.27
+Release:        1%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -35,14 +35,11 @@
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
-# TODO: patch2 still needed with --with-system-packages???
-Patch2:         %{name}-21.5.25-find-paths-pkgdir.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.26-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
 # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html
 Patch6:         %{name}-21.5.26-gtk-gcc4.patch
-Patch7:         %{name}-21.5.26-maximize.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -175,15 +172,14 @@
 sed -i -e /tetris/d lisp/menubar-items.el
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el
 %patch3 -p1
 %ifarch ia64
 %patch4 -p1
 %endif
 %patch5 -p1
 %patch6 -p1
-%patch7 -p0
+
+sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -386,9 +382,12 @@
     %{_bindir}/xemacs-%{xver} 80 || :
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+# bugfix for 21.5.26, to be removed later
+%{_sbindir}/alternatives --remove xemacs \
+    %{_bindir}/xemacs-21.5-b26 &>/dev/null || :
 
 %postun
-[ $1 -ne 0 ] || \
+[ -e %{_bindir}/xemacs-%{xver} ] || \
 %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || :
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
@@ -398,9 +397,12 @@
 rm -f %{_bindir}/xemacs && \
 %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
     %{_bindir}/xemacs-nox-%{xver} 40 || :
+# bugfix for 21.5.26, to be removed later
+%{_sbindir}/alternatives --remove xemacs \
+    %{_bindir}/xemacs-nox-21.5-b26 &>/dev/null || :
 
 %postun nox
-[ $1 -ne 0 ] || \
+[ -e %{_bindir}/xemacs-nox-%{xver} ] || \
 %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || :
 
 %post common
@@ -493,6 +495,11 @@
 
 
 %changelog
+* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-1
+- 21.5.27, maximize patch included upstream.
+- Drop no longer needed find-paths patch.
+- Fix alternatives setup.
+
 * Sun May  7 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-5
 - Apply upstream fix for window maximization problems (#111225).
 


--- xemacs-21.5.25-find-paths-pkgdir.patch DELETED ---


--- xemacs-21.5.26-maximize.patch DELETED ---




More information about the fedora-extras-commits mailing list