rpms/xemacs/devel xemacs-21.4.17-x-paths.patch, NONE, 1.1 xemacs.spec, 1.13, 1.14
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Fri Nov 25 15:49:36 UTC 2005
Author: scop
Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19939
Modified Files:
xemacs.spec
Added Files:
xemacs-21.4.17-x-paths.patch
Log Message:
* Fri Nov 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-5
- Adapt to modular X.Org.
- Move icon to icons/hicolor and to the main package.
- Move man pages to subpackages where the things they document are,
install a few more of them.
- Mark config files as noreplace.
- Drop no longer needed obsoletions.
- Start cleaning up unneeded files.
- Don't use %exclude.
- Use %bcond_with*.
xemacs-21.4.17-x-paths.patch:
--- NEW FILE xemacs-21.4.17-x-paths.patch ---
--- xemacs-21.4.17/etc/xemacs.1~ 2001-04-12 21:20:52.000000000 +0300
+++ xemacs-21.4.17/etc/xemacs.1 2005-11-25 12:34:43.000000000 +0200
@@ -293,7 +293,7 @@
Sets the color of the text.
See the file
-.I /usr/lib/X11/rgb.txt
+.I /usr/share/X11/rgb.txt
for a list of valid
color names.
.TP
--- xemacs-21.4.17/etc/Emacs.ad~ 2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.17/etc/Emacs.ad 2005-11-25 12:35:46.000000000 +0200
@@ -9,7 +9,7 @@
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
!
-! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
+! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time. (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xdefaults instead.)
--- xemacs-21.4.17/lisp/minibuf.el~ 2002-04-30 19:05:46.000000000 +0300
+++ xemacs-21.4.17/lisp/minibuf.el 2005-11-25 12:35:17.000000000 +0200
@@ -2187,7 +2187,8 @@
;; Ben wanted all of the possibilities from the `configure' script used
;; here, but I think this is way too many. I already trimmed the R4 variants
;; and a few obvious losers from the list. --Stig
-(defvar x-library-search-path '("/usr/X11R6/lib/X11/"
+(defvar x-library-search-path '("/usr/share/X11/"
+ "/usr/X11R6/lib/X11/"
"/usr/X11R5/lib/X11/"
"/usr/lib/X11R6/X11/"
"/usr/lib/X11R5/X11/"
--- xemacs-21.4.17/lisp/font.el~ 2002-08-20 14:34:44.000000000 +0300
+++ xemacs-21.4.17/lisp/font.el 2005-11-25 12:35:35.000000000 +0200
@@ -1080,7 +1080,8 @@
x-library-search-path
;; This default is from XEmacs 19.13 - hope it covers
;; everyone.
- (list "/usr/X11R6/lib/X11/"
+ (list "/usr/share/X11/"
+ "/usr/X11R6/lib/X11/"
"/usr/X11R5/lib/X11/"
"/usr/lib/X11R6/X11/"
"/usr/lib/X11R5/X11/"
Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xemacs.spec 29 Jun 2005 22:18:48 -0000 1.13
+++ xemacs.spec 25 Nov 2005 15:49:34 -0000 1.14
@@ -1,9 +1,14 @@
+%bcond_with gtk
+%bcond_with xaw3d
+%bcond_without debug
+%bcond_without mule
+
%define pkgdir %{_datadir}/xemacs
%define exectop %{_libdir}/xemacs-%{version}
Name: xemacs
Version: 21.4.17
-Release: 4
+Release: 5%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
@@ -18,6 +23,7 @@
Source23: dotxemacs-init.el
Source24: default.el
Patch0: xemacs-21.4.17-innerbuf.patch
+Patch1: xemacs-21.4.17-x-paths.patch
Patch5: xemacs-21-cursor.patch
Patch10: xemacs-21.4.10-find-paths-pkgdir.patch
Patch11: movemail-mktemp.patch
@@ -43,27 +49,26 @@
BuildRequires: libpng-devel
BuildRequires: libtiff-devel
BuildRequires: desktop-file-utils
-%if 0%{!?_without_mule:1}
+%if !%{with mule}
BuildRequires: Canna-devel
BuildRequires: FreeWnn-devel
%endif # mule
-%if 0%{?_with_gtk:1}
+%if %{with gtk}
BuildRequires: gtk+-devel
BuildRequires: libglade-devel
%else
-%if 0%{?_with_xaw3d:1}
+%if %{with xaw3d}
BuildRequires: Xaw3d-devel
%else
BuildRequires: neXtaw-devel
%endif # xaw3d
%endif # gtk
+# TODO: verify these build deps wrt gtk/xaw3d builds
+BuildRequires: xorg-x11-xbitmaps
+BuildRequires: libXaw-devel
+BuildRequires: libXpm-devel
Requires: xemacs-sumo >= 20050118-2
Requires: xemacs-common = %{version}-%{release}
-Obsoletes: xemacs-extras
-Obsoletes: xemacs-noX
-Obsoletes: xemacs-X11
-Obsoletes: xemacs-mule
-Obsoletes: xemacs-static
%description
XEmacs is a highly customizable open source text editor and
@@ -72,7 +77,7 @@
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 for X Windows%{!?_without_mule: with MULE support}.
+This package contains XEmacs built for X Windows%{?with_mule: with MULE support}.
%package common
Summary: Byte-compiled lisp files and other common files for XEmacs
@@ -137,8 +142,11 @@
%prep
%setup -q
+f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+
## lisp patches ##
+%patch1 -p1 -b .x-paths
# make find-paths.el look in datadir
rm lisp/find-paths.elc
%patch10 -p1
@@ -199,8 +207,8 @@
--with-hesiod=no
--with-msw=no
--pdump
- --debug=%{?_without_debug:no}%{!?_without_debug:yes}
- %{!?_without_mule:--with-mule=yes}
+ --debug=%{?with_debug:yes}%{!?with_debug:no}
+ %{?with_mule:--with-mule=yes}
%ifarch alpha ia64 ppc64
--with-system-malloc
%endif
@@ -234,11 +242,11 @@
--docdir=%{exectop}/doc/ \
--with-sound=native \
--with-xim=xlib \
-%if 0%{?_with_gtk:1}
+%if %{with gtk}
--with-gtk \
--with-gnome \
%else
- --with-athena=%{?_with_xaw3d:3d}%{!?_with_xaw3d:next} \
+ --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \
--with-widgets=athena \
--with-menubars=lucid \
--with-scrollbars=lucid \
@@ -263,6 +271,7 @@
%makeinstall \
mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
docdir=$RPM_BUILD_ROOT%{exectop}/doc/
+install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1
# install nox files
install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir}
@@ -279,7 +288,8 @@
# these clash with GNU Emacs
mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs}
rm -f $RPM_BUILD_ROOT%{_bindir}/{ctags,rcs-checkin,b2m}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/[ce]tags.1
+mv $RPM_BUILD_ROOT%{_mandir}/man1/etags{,.xemacs}.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/ctags.1
# these clash with other packages
rm -f $RPM_BUILD_ROOT%{_infodir}/info*
@@ -309,7 +319,8 @@
install -Dpm 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el
# icon
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/xemacs.png
+install -Dpm 644 %{SOURCE1} \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
# make sure nothing is 0400
chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
@@ -321,6 +332,12 @@
python %{SOURCE22} \
$RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el
+# clean up "junk" (TODO: there's much more!)
+cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc
+rm -r aliases.ksh BETA check_cygwin_setup.sh CODING-STANDARDS InstallGuide \
+ sparcworks tests xemacs-fe.sh XKeysymDB *.sco *.1
+cd -
+
# separate files
rm -f *.files base-files el-files info-files
echo "%%defattr(-,root,root,-)" > base-files
@@ -336,7 +353,7 @@
sed -i -e "s|$RPM_BUILD_ROOT||" *.files
# make site-packages lisp files config files
-sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config \1|' \
+sed -i -e 's|^\(.*/site-packages/lisp/.*\)$|%%config(noreplace) \1|' \
base-el-not-bytecomped.files
# combine the file lists
@@ -350,9 +367,11 @@
%post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
%postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
%post common
@@ -381,10 +400,14 @@
%defattr(-,root,root,-)
%{_bindir}/xemacs
%{_bindir}/xemacs-%{version}
+# gnuclient, gnuserv need X libs, so not in -common
%{_bindir}/gnuclient
-%{exectop}/*/gnuserv
+%{exectop}/*linux/gnuserv
%{exectop}/doc/
%{_datadir}/applications/*-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
+%{_mandir}/man1/gnuclient.1*
+%{_mandir}/man1/gnuserv.1*
%files nox
%defattr(-,root,root,-)
@@ -396,17 +419,21 @@
%defattr(-,root,root,-)
%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
-%{_bindir}/*
-%exclude %{_bindir}/xemacs*
-# needs X libs
-%exclude %{_bindir}/gnuclient
-%{exectop}/
-%exclude %{exectop}/doc*
-# needs X libs
-%exclude %{exectop}/*/gnuserv
-%{_datadir}/pixmaps/xemacs.png
-%config %{_sysconfdir}/skel/.xemacs/
-%{_mandir}/man1/*.1*
+%{_bindir}/ellcc
+%{_bindir}/etags.xemacs
+%{_bindir}/gnuattach
+%{_bindir}/gnudoit
+%{_bindir}/ootags
+%dir %{exectop}/
+%dir %{exectop}/*linux/
+%{exectop}/*linux/[acdfhimprsvwy]*
+%{exectop}/*linux/gzip-el.sh
+%config(noreplace) %{_sysconfdir}/skel/.xemacs/
+%{_mandir}/man1/etags.xemacs.1*
+%{_mandir}/man1/gnuattach.1*
+%{_mandir}/man1/gnudoit.1*
+%{_mandir}/man1/xemacs.1*
+%lang(ja) %{_mandir}/ja/man1/xemacs.1*
%dir %{_localstatedir}/lock/xemacs/
%files el -f el-files
@@ -418,6 +445,17 @@
%changelog
+* Fri Nov 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-5
+- Adapt to modular X.Org.
+- Move icon to icons/hicolor and to the main package.
+- Move man pages to subpackages where the things they document are,
+ install a few more of them.
+- Mark config files as noreplace.
+- Drop no longer needed obsoletions.
+- Start cleaning up unneeded files.
+- Don't use %%exclude.
+- Use %%bcond_with*.
+
* Thu Jun 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-4
- Improve package summaries and descriptions, reformat/clean up specfile.
- Bring back Wnn support.
More information about the fedora-extras-commits
mailing list