SPECS: xrn.spec - BR: bison, flex - fix build, kill _applnkdir - r...

[darekr]

Author: darekr                       Date: Sat May 13 18:42:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: bison, flex
- fix build, kill _applnkdir
- rel. 14

---- Files affected:
SPECS:
   xrn.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/xrn.spec
diff -u SPECS/xrn.spec:1.22 SPECS/xrn.spec:1.23
--- SPECS/xrn.spec:1.22	Mon Feb 16 18:27:49 2004
+++ SPECS/xrn.spec	Sat May 13 20:42:08 2006
@@ -20,10 +20,10 @@
 Summary(zh_CN):	Ňť¸öťůÓÚ X ´°żÚϾͳľÄĐÂÎĹÔÄśÁĆ÷ĄŁ
 Name:		xrn
 Version:	9.02
-Release:	13
+Release:	14
 License:	distributable
 Group:		Applications/News
-Source0:	ftp://sipb.mit.edu/pub/%{name}/%{name}-%{version}.tgz
+Source0:	ftp://sipb.mit.edu/pub/xrn/%{name}-%{version}.tgz
 # Source0-md5:	2920543df71c29fda8bb384a7c4f208b
 Source1:	%{name}.desktop
 Source2:	%{name}.png
@@ -32,8 +32,13 @@
 Patch2:		%{name}-time.patch
 URL:		http://www.mit.edu/people/jik/software/xrn.html
 BuildRequires:	XFree86-devel
+BuildRequires:	bison
+BuildRequires:	flex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_xbindir	/usr/X11R6/bin
+%define	 	_appdefsdir	/usr/X11R6/lib/X11/app-defaults
+%define		_mandir		/usr/X11R6/man
 
 %description
 A simple Usenet News reader for the X Window System. xrn allows you to
@@ -92,11 +97,12 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_applnkdir}/Network/News,%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} install install.man DESTDIR=$RPM_BUILD_ROOT
+%{__make} install install.man \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/News/xrn.desktop
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/xrn.desktop
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}/xrn.png
 
 %clean
@@ -105,9 +111,9 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYRIGHT COMMON-PROBLMS README README.Linux TODO ChangeLog
-%attr(755,root,root) %{_bindir}/xrn
-%config %{_libdir}/X11/app-defaults/XRn
-%{_applnkdir}/Network/News/xrn.desktop
+%attr(755,root,root) %{_xbindir}/xrn
+%config %{_appdefsdir}/XRn
+%{_desktopdir}/xrn.desktop
 %{_pixmapsdir}/xrn.png
 %{_mandir}/man1/*
 
@@ -117,6 +123,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2006/05/13 18:42:08  darekr
+- BR: bison, flex
+- fix build, kill _applnkdir
+- rel. 14
+
 Revision 1.22  2004/02/16 17:27:49  qboosh
 - next part of locale names update for glibc 2.3.3: s/no/nb/ in rpm headers
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xrn.spec?r1=1.22&r2=1.23&f=u