rpms/xemacs/devel xemacs-21.5.29-x-server.patch, NONE, 1.1 xemacs.spec, 1.61, 1.62

Jerry James jjames at fedoraproject.org
Tue Jul 6 19:15:37 UTC 2010


Author: jjames

Update of /cvs/pkgs/rpms/xemacs/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2325/devel

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.29-x-server.patch 
Log Message:
* Tue Jul  6 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-13
- Add db4 support (bz 581614).
- Add -xft subpackage (bz 356961).
- Recognize Fedora's X server.


xemacs-21.5.29-x-server.patch:
 x-init.el |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xemacs-21.5.29-x-server.patch ---
diff -dur xemacs-21.5.29.ORIG/lisp/x-init.el xemacs-21.5.29/lisp/x-init.el
--- xemacs-21.5.29.ORIG/lisp/x-init.el	2009-05-18 08:51:07.000000000 -0600
+++ xemacs-21.5.29/lisp/x-init.el	2010-07-06 12:07:24.064305596 -0600
@@ -243,7 +243,7 @@
 	       (string-equal "X Consortium" vendor))
            ;; Ok, we think this could be a Sun keyboard.  Run the Sun code.
 	   (x-win-init-sun device))
-          ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation" vendor)
+          ((string-match #r"XFree86\|Cygwin/X\|The X\.Org Foundation\|Fedora Project" vendor)
            ;; Those XFree86 people do some weird keysym stuff, too.
 	   (x-win-init-xfree86 device)))))
 


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- xemacs.spec	2 Mar 2010 15:38:30 -0000	1.61
+++ xemacs.spec	6 Jul 2010 19:15:36 -0000	1.62
@@ -6,7 +6,6 @@
 %bcond_with     wnn
 %bcond_with     xaw3d
 %bcond_with     xfs
-%bcond_with     xft
 %bcond_without  mule
 %bcond_without  nox
 %bcond_without  xim
@@ -22,7 +21,7 @@
 
 Name:           xemacs
 Version:        21.5.29
-Release:        12%{?snap:.%{snap}}%{?dist}
+Release:        13%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -62,6 +61,7 @@ Patch12:        %{name}-21.5.29-arabic-5
 Patch13:        %{name}-21.5.29-dired-550145.patch
 # Sent upstream 2009-03-12
 Patch14:        %{name}-beta-infodir.patch
+Patch15:        %{name}-21.5.29-x-server.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -87,6 +87,7 @@ BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  alsa-lib-devel
+BuildRequires:  db4-devel
 BuildRequires:  gmp-devel
 %if %{with gtk}
 BuildRequires:  gtk+-devel
@@ -99,9 +100,7 @@ BuildRequires:  Xaw3d-devel
 BuildRequires:  neXtaw-devel
 %endif # xaw3d
 %endif # gtk
-%if %{with xft}
 BuildRequires:  libXft-devel
-%endif # xft
 # Note: no xemacs-packages-extra dependency here, need main pkg to build it.
 Requires:       xemacs-packages-base >= 20060510
 Requires:       %{name}-common = %{version}-%{release}
@@ -157,6 +156,23 @@ and an open software development model, 
 
 This package contains XEmacs built without X Windows support.
 
+%package        xft
+Summary:        Different version of Emacs built with Xft/fontconfig support
+Group:          Applications/Editors
+Requires:       %{name}-common = %{version}-%{release}
+Requires:       xemacs-packages-base >= 20060510
+Requires(post): coreutils
+Provides:       xemacs(bin) = %{version}-%{release}
+
+%description    xft
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+This package contains XEmacs built with Xft and fontconfig support.
+
 %package        el
 Summary:        Emacs lisp source files for XEmacs
 Group:          Development/Libraries
@@ -221,9 +237,7 @@ touch -r aclocal.m4 aclocal.m4-stamp
 touch -r aclocal.m4-stamp aclocal.m4
 %endif
 %patch5 -p1
-%if %{without xft}
 %patch6 -p1
-%endif
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -232,6 +246,7 @@ touch -r aclocal.m4-stamp aclocal.m4
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
@@ -266,7 +281,7 @@ common_options="
     --with-mule
 %endif
     --with-clash-detection
-    --with-database=no
+    --with-database=berkdb
     --without-ldap
     --without-postgresql
     --with-mail-locking=lockf
@@ -304,6 +319,31 @@ for file in {e,oo}tags gnuserv {fake,mov
 done
 %endif # nox
 
+# build with Xft
+%configure $common_options \
+    --with-docdir=%{_libdir}/xemacs-%{xver}/doc-xft \
+    --with-sound=nonative,alsa \
+    --with-xft=all \
+%if %{with gtk}
+    --with-gtk \
+    --with-gnome \
+%else
+    --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \
+    --with-menubars=lucid \
+    --with-widgets=athena \
+    --with-dialogs=athena \
+    --with-scrollbars=lucid \
+    --with-xim=%{?with_xim:xlib}%{!?with_xim:no} \
+%endif
+%if ! %{with wnn}
+    --without-wnn
+%endif
+make EMACSDEBUGPATHS=yes # toplevel parallel make fails
+mv lib-src/DOC{,-xft}
+mv src/xemacs{,-xft-%{xver}}
+mv lib-src/config.values{,-xft}
+mv Installation{,-xft}
+
 # build with X
 %configure $common_options \
     --with-docdir=%{_libdir}/xemacs-%{xver}/doc \
@@ -385,6 +425,16 @@ install -pm 644 lib-src/config.values-no
     $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values
 %endif # nox
 
+# install xft files
+echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-xft.1
+install -pm 755 src/xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}
+ln -s xemacs-xft-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-xft
+install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft
+install -pm 644 lib-src/DOC-xft \
+    $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/DOC
+install -pm 644 lib-src/config.values-xft \
+    $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-xft/config.values
+
 # these clash with GNU Emacs
 mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs}
 rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m}
@@ -497,6 +547,16 @@ rm -f %{_bindir}/xemacs && \
 [ -e %{_bindir}/xemacs-nox-%{xver} ] || \
 %{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || :
 
+%post xft
+# rm because alternatives won't overwrite pre-alternatives symlink, bug?
+rm -f %{_bindir}/xemacs && \
+%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
+    %{_bindir}/xemacs-xft-%{xver} 40 || :
+
+%postun xft
+[ -e %{_bindir}/xemacs-xft-%{xver} ] || \
+%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-xft-%{xver} || :
+
 %post common
 %{_sbindir}/alternatives --install %{_bindir}/etags etags \
     %{_bindir}/etags.xemacs 40 || :
@@ -550,6 +610,15 @@ fi
 %{_mandir}/man1/xemacs-nox.1*
 %endif
 
+%files xft
+%defattr(-,root,root,-)
+%doc Installation-xft
+%ghost %{_bindir}/xemacs
+%{_bindir}/xemacs-xft
+%{_bindir}/xemacs-xft-%{xver}
+%{_libdir}/xemacs-%{xver}/doc-xft/
+%{_mandir}/man1/xemacs-xft.1*
+
 %files common -f base-files
 %defattr(-,root,root,-)
 %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL
@@ -594,6 +663,11 @@ fi
 
 
 %changelog
+* Tue Jul  6 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-13
+- Add db4 support (bz 581614).
+- Add -xft subpackage (bz 356961).
+- Recognize Fedora's X server.
+
 * Tue Mar  2 2010 Jerry James <loganjerry at gmail.com> - 21.5.29-12
 - Remove the bitmap-fonts dependency.
 



More information about the scm-commits mailing list