SPECS (AC-branch): xemacs.spec - up to 21.4.19 (latest stable vers...

[twittner]

Author: twittner                     Date: Mon Mar 20 00:02:50 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- up to 21.4.19 (latest stable version)
- up base-packages to 2.01
- added desktop file for xemacs-nox
- fixed %%files (don't include xemacs-base twice, new tutorials,
  missing directories)

---- Files affected:
SPECS:
   xemacs.spec (1.141 -> 1.141.2.1) 

---- Diffs:

================================================================
Index: SPECS/xemacs.spec
diff -u SPECS/xemacs.spec:1.141 SPECS/xemacs.spec:1.141.2.1
--- SPECS/xemacs.spec:1.141	Thu Jun  9 23:27:43 2005
+++ SPECS/xemacs.spec	Mon Mar 20 01:02:45 2006
@@ -6,7 +6,7 @@
 %bcond_with	gtk		# GTK+ enabled version
 #
 %define		ver		21.4
-%define		basepkgver	1.97
+%define		basepkgver	2.01	
 Summary:	The XEmacs -- Emacs: The Next Generation
 Summary(es):	El editor XEmacs
 Summary(ja):	XEmacs Ľ¨ĽÇĽŁĽż
@@ -15,16 +15,15 @@
 Summary(ru):	÷ĹŇÓÉŃ GNU Emacs ÄĚŃ X Window System
 Summary(uk):	÷ĹŇÓŚŃ GNU Emacs ÄĚŃ X Window System
 Name:		xemacs
-Version:	%{ver}.17
-Release:	3
+Version:	%{ver}.19
+Release:	1
 License:	GPL
 Group:		Applications/Editors/Emacs
 Source0:	ftp://ftp.xemacs.org/xemacs/%{name}-%{ver}/%{name}-%{version}.tar.gz
-# Source0-md5:	835d539709fbbe8e30cd5de8b3541aa1
-Source1:	ftp://ftp.xemacs.org/xemacs/%{name}-%{ver}/%{name}-%{version}-elc.tar.gz
-# Source1-md5:	8f678003cc78cd0faecc5ab9e3b8818f
-Source2:	ftp://ftp.xemacs.org/xemacs/packages/%{name}-base-%{basepkgver}-pkg.tar.gz
-# Source2-md5:	d51d8afe507a0bb17f08ef211f9f6f5a
+# Source0-md5:	3f753e2cc22a428c7d775339f29c7e46
+Source1:	ftp://ftp.xemacs.org/xemacs/packages/%{name}-base-%{basepkgver}-pkg.tar.gz
+# Source1-md5:	a378f0ed585ebb9d6d8ace534f7e5987
+Source2:	%{name}-nox.desktop
 Source3:	%{name}.desktop
 Source4:	%{name}.ad-pl
 Source5:	%{name}-default.el
@@ -182,7 +181,7 @@
 Emacsa, to koniecznie zainstaluj ten pakiet.
 
 %prep
-%setup -q -b1 -a2
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %ifarch alpha ia64
@@ -306,7 +305,7 @@
 	$RPM_BUILD_ROOT{%{_mandir}/{ja/man1,man1},%{_appdefsdir}/pl} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}/lisp \
 	$RPM_BUILD_ROOT%{_ulibdir}/%{name} \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}-packages/{etc,lib-src}
+	$RPM_BUILD_ROOT%{_datadir}/%{name}-packages/{etc,lib-src,lisp,{,pkg}info}
 
 %{__make} install-arch-dep install-arch-indep \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -314,10 +313,11 @@
 	mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
 	datadir=$RPM_BUILD_ROOT%{_datadir} \
 
-install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 
-( cd $RPM_BUILD_ROOT%{_datadir}/%{name}-packages; gzip -dc %{SOURCE2} | tar xf - )
+%{__tar} zxf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/%{name}-packages
 
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}-packages/lisp/default.el
 install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/%{name}-packages/lisp/ogony-mule.el
 install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/%{name}-packages/lisp/ogony-nomule.el
@@ -395,7 +395,7 @@
 %{_datadir}/%{name}-%{version}/etc/*.xpm
 %{_appdefsdir}/Emacs
 %lang(pl) %{_appdefsdir}/pl/Emacs
-%{_desktopdir}/*
+%{_desktopdir}/xemacs.desktop
 %{_pixmapsdir}/*
 %{_mandir}/man1/gnuattach.1*
 %{_mandir}/man1/gnuclient.1*
@@ -408,6 +408,7 @@
 %dir %{_datadir}/%{name}-%{version}/etc
 %{_datadir}/%{name}-%{version}/etc/package-index.LATEST.gpg
 %doc %{_datadir}/%{name}-%{version}/etc/TUTORIAL
+%doc %lang(cs) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.cs
 %doc %lang(de) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.de
 %doc %lang(fr) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.fr
 %doc %lang(hr) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.hr
@@ -417,6 +418,8 @@
 %doc %lang(pl) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.pl
 %doc %lang(ro) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.ro
 %doc %lang(ru) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.ru
+%doc %lang(se) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.se
+%doc %lang(sl) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.sl
 %doc %lang(th) %{_datadir}/%{name}-%{version}/etc/TUTORIAL.th
 %doc %{_datadir}/%{name}-%{version}/etc/[A-SU-Z]*
 %doc %{_datadir}/%{name}-%{version}/etc/refcard.ps.gz
@@ -438,9 +441,14 @@
 %{_datadir}/%{name}-%{version}/lisp
 
 %dir %{_datadir}/%{name}-packages
-%{_datadir}/%{name}-packages/etc
-%{_datadir}/%{name}-packages/lisp
-%{_datadir}/%{name}-packages/lib-src
+%dir %{_datadir}/%{name}-packages/etc
+%{_datadir}/%{name}-packages/etc/*
+%dir %{_datadir}/%{name}-packages/lisp
+%{_datadir}/%{name}-packages/lisp/*
+%dir %{_datadir}/%{name}-packages/lib-src
+%dir %{_datadir}/%{name}-packages/info
+%dir %{_datadir}/%{name}-packages/pkginfo
+%{_datadir}/%{name}-packages/pkginfo/*
 
 %{_mandir}/man1/xemacs.1*
 %lang(ja) %{_mandir}/ja/man1/*
@@ -452,6 +460,7 @@
 %files nox
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xemacs-nox
+%{_desktopdir}/xemacs-nox.desktop
 %if %{with pdump}
 %attr(644,root,root) %{_bindir}/xemacs-nox.dmp
 %endif
@@ -468,6 +477,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141.2.1  2006/03/20 00:02:45  twittner
+- up to 21.4.19 (latest stable version)
+- up base-packages to 2.01
+- added desktop file for xemacs-nox
+- fixed %%files (don't include xemacs-base twice, new tutorials,
+  missing directories)
+
 Revision 1.141  2005/06/09 21:27:43  arekm
 - add BR: XFree86; up base pkg to 1.97
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xemacs.spec?r1=1.141&r2=1.141.2.1&f=u