rpms/xemacs/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xemacs.desktop, 1.1, 1.2 xemacs.spec, 1.3, 1.4 xemacs-21-cursor.patch, 1.1, NONE xemacs-21.4.17-innerbuf.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Dec 5 17:30:57 UTC 2005
Author: scop
Update of /cvs/extras/rpms/xemacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913
Modified Files:
.cvsignore sources xemacs.desktop xemacs.spec
Removed Files:
xemacs-21-cursor.patch xemacs-21.4.17-innerbuf.patch
Log Message:
* Mon Dec 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.18-1
- 21.4.18, innerbuf and cursor patches applied upstream.
- Move icon to icons/hicolor and to the main package.
- Move man pages to subpackages where the things they document are.
- Point to main man page for xemacs-nox.
- Improve subpackage summaries.
- Use desktop-file-install for installing the desktop entry, fix up X-*
categories, update desktop database at post (un)install time.
- Really mark default init files as %config.
- Mark config files as noreplace.
- Make sure scriptlet errors won't break upgrades.
- Don't own %{_bindir} in -common.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 1 Mar 2005 22:11:36 -0000 1.2
+++ .cvsignore 5 Dec 2005 17:30:55 -0000 1.3
@@ -1 +1 @@
-xemacs-21.4.17.tar.bz2
+xemacs-21.4.18.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 1 Mar 2005 22:11:36 -0000 1.2
+++ sources 5 Dec 2005 17:30:55 -0000 1.3
@@ -1 +1 @@
-a207e106138c085711160855d78b72a2 xemacs-21.4.17.tar.bz2
+08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2
Index: xemacs.desktop
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xemacs.desktop 1 Mar 2005 22:11:36 -0000 1.1
+++ xemacs.desktop 5 Dec 2005 17:30:55 -0000 1.2
@@ -29,6 +29,6 @@
Icon=xemacs
Type=Application
Terminal=false
-Categories=Application;Development;TextEditor;X-Red-Hat-Extra;
+Categories=Application;Development;TextEditor;
Encoding=UTF-8
StartupWMClass=Emacs
Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xemacs.spec 5 May 2005 19:24:59 -0000 1.3
+++ xemacs.spec 5 Dec 2005 17:30:55 -0000 1.4
@@ -1,7 +1,7 @@
Summary: Different version of Emacs
Name: xemacs
-Version: 21.4.17
-Release: 3
+Version: 21.4.18
+Release: 1%{?dist}
License: GPL
Group: Applications/Editors
Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2
@@ -12,8 +12,6 @@
Source22: delprevline.py
Source23: dotxemacs-init.el
Source24: default.el
-Patch0: xemacs-21.4.17-innerbuf.patch
-Patch5: xemacs-21-cursor.patch
Patch10: xemacs-21.4.10-find-paths-pkgdir.patch
Patch11: movemail-mktemp.patch
Patch14: menubar-games.patch
@@ -26,7 +24,7 @@
Patch24: xemacs-21.4.15-wnnfix-128362.patch
URL: http://www.xemacs.org/
Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: perl python autoconf213
+BuildRequires: perl python autoconf213 texinfo desktop-file-utils
BuildRequires: XFree86-devel ncurses-devel gpm-devel
BuildRequires: pam-devel zlib-devel libjpeg-devel glibc-devel compface
BuildRequires: libpng-devel libtiff-devel Canna-devel
@@ -47,7 +45,7 @@
This package contains xemacs built for X Windows with MULE support.
%package common
-Summary: The byte-compiled lisp files and other common files for XEmacs.
+Summary: Byte-compiled lisp files and other common files for XEmacs
Group: Applications/Editors
PreReq: %{_sbindir}/alternatives
@@ -62,7 +60,7 @@
This package contains byte-compiled lisp and other common files for XEmacs.
%package nox
-Summary: A different version of Emacs built without X Windows Support.
+Summary: Different version of Emacs built without X Windows support
Group: Applications/Editors
# Note: no xemacs-sumo dependency here, we need -nox to build the sumo package.
Requires: xemacs-common = %{version}-%{release}
@@ -78,8 +76,8 @@
This package contains XEmacs built without X Windows support.
%package el
-Summary: The .el source files for XEmacs.
-Group: Applications/Editors
+Summary: Emacs lisp source files for XEmacs
+Group: Development/Libraries
%description el
XEmacs is a highly customizable open source text editor and
@@ -89,11 +87,12 @@
user interface support and an open software development
model, similar to Linux.
-This package contains the lisp source files for XEmacs.
+This package contains the lisp source files for XEmacs mainly of
+interest when developing or debugging XEmacs itself.
%package info
-Summary: Information files for XEmacs.
-Group: Applications/Editors
+Summary: XEmacs documentation in GNU texinfo format
+Group: Documentation
PreReq: /sbin/install-info
%description info
@@ -104,7 +103,7 @@
user interface support and an open software development
model, similar to Linux.
-This package contains the XEmacs manuals in info format.
+This package contains XEmacs documentation in GNU texinfo format.
%define pkgdir %{_datadir}/xemacs
@@ -116,7 +115,6 @@
## Lisp patches ##
# make find-paths.el look in datadir
-rm lisp/find-paths.elc
%patch10 -p1
# fix "libexec" on multilib
%ifarch x86_64 s390x
@@ -126,12 +124,9 @@
%patch14 -p1
# make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
%patch18 -p1
-rm lisp/dump-paths.elc
sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
## non-Lisp patches ##
-%patch0 -p1 -b .innerbuf
-%patch5 -p1 -b .cursor
# movemail
%patch11 -p1 -b .mkstemp
# skip redundant check-features
@@ -230,6 +225,7 @@
# make docdir
mkdir -p %buildroot%{exectop}/doc
%makeinstall mandir=%buildroot%{_mandir}/man1 docdir=%buildroot%{exectop}/doc/
+echo ".so man1/xemacs.1" > %buildroot%{_mandir}/man1/xemacs-nox.1
# install nox files
mkdir -p %buildroot%{exectop}/doc-nox
@@ -253,8 +249,12 @@
rm -f %buildroot%{_infodir}/standards*
rm -f %buildroot%{_infodir}/termcap*
-install -m 755 -d %buildroot%{_datadir}/applications
-install -m 644 %SOURCE6 %buildroot%{_datadir}/applications/net-xemacs.desktop
+desktop-file-install \
+ --vendor=fedora \
+ --mode=644 \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category=X-Fedora \
+ %{SOURCE6}
# Lockdir
mkdir -p %buildroot%{_localstatedir}/lock/xemacs
@@ -271,7 +271,8 @@
install -m 0644 %SOURCE23 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el
# icon
-install -Dpm 644 %{SOURCE1} %buildroot%{_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 %buildroot%{_prefix}
@@ -291,7 +292,7 @@
# remove buildroot prefix from files
sed -i -e "s|%buildroot||" *.files
# make site-packages lisp files config files
-perl -pe 's|^(.+/site-packages/lisp/.+)$|%%config $1|' base-el-not-bytecomped.files
+perl -pi -e 's|^(.+/site-packages/lisp/.+)$|%%config(noreplace) $1|' base-el-not-bytecomped.files
# combine the file lists
cat base-*.files dir.files >> base-files
cat el-*.files dir.files >> el-files
@@ -302,8 +303,16 @@
rm -rf %buildroot
+%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
-alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40
+alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40 || :
%preun common
if [ "$1" = 0 ]; then
@@ -312,13 +321,13 @@
%post info
for file in xemacs cl internals lispref new-users-guide; do
- /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
+ /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || :
done
%preun info
if [ "$1" = "0" ]; then
for file in xemacs cl internals lispref new-users-guide; do
- /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir
+ /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || :
done
fi
@@ -327,10 +336,14 @@
%defattr(-, root, root)
%{_bindir}/xemacs
%{_bindir}/xemacs-%{version}
+# gnuclient, gnuserv need X libs, so not in -common
%{_bindir}/gnuclient
%{exectop}/*/gnuserv
%{exectop}/doc
-%{_datadir}/applications/*
+%{_datadir}/applications/*-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
+%{_mandir}/man1/gnuclient.1*
+%{_mandir}/man1/gnuserv.1*
%files nox
%defattr(-, root, root)
@@ -343,17 +356,19 @@
%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages
%doc etc/TUTORIAL
-%exclude %{_bindir}/xemacs*
-# needs X libs
-%exclude %{_bindir}/gnuclient
-%{_bindir}
+%{_bindir}/ellcc
+%{_bindir}/etags.xemacs
+%{_bindir}/gnuattach
+%{_bindir}/gnudoit
+%{_bindir}/ootags
%exclude %{exectop}/doc*
# needs X libs
%exclude %{exectop}/*/gnuserv
%{exectop}
-%{_datadir}/pixmaps/xemacs.png
-%config %{_sysconfdir}/skel/.xemacs
-%{_mandir}/*/*
+%config(noreplace) %{_sysconfdir}/skel/.xemacs
+%{_mandir}/man1/gnuattach.1*
+%{_mandir}/man1/gnudoit.1*
+%{_mandir}/man1/xemacs*.1*
%attr(1777, root, root) %{_localstatedir}/lock/xemacs
%files el -f el-files
@@ -365,6 +380,19 @@
%changelog
+* Mon Dec 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.18-1
+- 21.4.18, innerbuf and cursor patches applied upstream.
+- Move icon to icons/hicolor and to the main package.
+- Move man pages to subpackages where the things they document are.
+- Point to main man page for xemacs-nox.
+- Improve subpackage summaries.
+- Use desktop-file-install for installing the desktop entry, fix up X-*
+ categories, update desktop database at post (un)install time.
+- Really mark default init files as %%config.
+- Mark config files as noreplace.
+- Make sure scriptlet errors won't break upgrades.
+- Don't own %%{_bindir} in -common.
+
* Thu May 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-3
- Avoid stack corruption in open-network-stream when built with gcc4
(Enrico Scholz, #154112).
--- xemacs-21-cursor.patch DELETED ---
--- xemacs-21.4.17-innerbuf.patch DELETED ---
More information about the fedora-extras-commits
mailing list