|
|
@@ -1,6 +1,6 @@
|
|
|
%define emacsversion 23.3
|
|
|
#% define rcversion rc1
|
|
|
-%define emacsrelease 3%{?rcversion:.%rcversion}%{?_dist_release}
|
|
|
+%define emacsrelease 4%{?rcversion:.%rcversion}%{?_dist_release}
|
|
|
%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
@@ -15,7 +15,7 @@ Summary(ja): GNU Emacs エディタ
|
|
|
Name: emacs
|
|
|
Version: %{emacsversion}
|
|
|
Release: %{emacsrelease}
|
|
|
-Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.bz2
|
|
|
+Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}b.tar.bz2
|
|
|
#Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}%{?rcversion:-%rcversion}.tar.gz
|
|
|
|
|
|
## Sources from Rawhide 21.2-11
|
|
|
@@ -61,6 +61,15 @@ Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
|
Patch34: emacs-23.2-hideshow-comment.patch
|
|
|
# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
|
|
|
#Patch35: emacs-23.2-spacing.patch
|
|
|
+# http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/106247
|
|
|
+Patch36: emacs-23.3-wm-state-hidden.patch
|
|
|
+# rhbz#751154
|
|
|
+Patch37: emacs-23.3-xgselect.patch
|
|
|
+# http://bzr.savannah.gnu.org/lh/emacs/trunk/revision/103228
|
|
|
+Patch38: emacs-23.1-103228_103227.patch
|
|
|
+# Upstream implemented the change in revno. 101105
|
|
|
+Patch40: emacs-23.1-xdg.patch
|
|
|
+
|
|
|
|
|
|
# security patches (from Debian)
|
|
|
|
|
|
@@ -136,6 +145,10 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
|
#%patch33 -p1 -b .m17ncheck
|
|
|
%patch34 -p0 -b .hideshow-comment
|
|
|
#%patch35 -p1 -b .spacing
|
|
|
+%patch36 -p1 -b .wm-state-hidden
|
|
|
+%patch37 -p1 -b .xgselect
|
|
|
+%patch38 -p0 -b .svn17
|
|
|
+%patch40 -p1 -b .xdg
|
|
|
|
|
|
#%patch501 -p1 -b .movemail
|
|
|
|
|
|
@@ -153,11 +166,10 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
%configure --with-pop --with-sound \
|
|
|
--libexecdir=%{_libdir} --infodir=%{infodir} \
|
|
|
--disable-rename \
|
|
|
- --with-toolkit=gtk \
|
|
|
- --with-freetype --with-xft \
|
|
|
- --enable-font-backend \
|
|
|
+ --with-x-toolkit=gtk \
|
|
|
+ --with-xft \
|
|
|
--without-gpm \
|
|
|
- --with-libotf \
|
|
|
+ --with-libotf \
|
|
|
%if %{?_dist_release} == "vl5"
|
|
|
--without-m17n-flt \
|
|
|
%endif
|
|
|
@@ -425,6 +437,15 @@ unset PRIORITY
|
|
|
%{_localstatedir}/games/emacs/*
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Jan 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 23.3-4
|
|
|
+- update to 23.3b
|
|
|
+- add patch36: Check for _NET_WM_STATE_HIDDEN (rhbz#711739)
|
|
|
+- add patch37: Initialize xgselect in function xg_select when
|
|
|
+ gfds_size == 0 (rhbz#751154)
|
|
|
+- add patch38: Apply upstream Subversion >= 1.7 dir structure
|
|
|
+ fix for vc-svn.el.
|
|
|
+- add patch40: use xdg-open for opening URLs
|
|
|
+
|
|
|
* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.3-3
|
|
|
- updated site-start.el
|
|
|
- defined vine-default-major-version, vine-default-minor-version,
|
daisuke