SPECS: groff.spec - BReq and app-defaults dir changed from X11R6 t...

[qrczak]

Author: qrczak                       Date: Thu Feb 15 15:43:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BReq and app-defaults dir changed from X11R6 to X.org.
- Release 2

---- Files affected:
SPECS:
   groff.spec (1.80 -> 1.81) 

---- Diffs:

================================================================
Index: SPECS/groff.spec
diff -u SPECS/groff.spec:1.80 SPECS/groff.spec:1.81
--- SPECS/groff.spec:1.80	Tue Feb 13 08:16:47 2007
+++ SPECS/groff.spec	Thu Feb 15 16:43:40 2007
@@ -18,7 +18,7 @@
 Name:		groff
 Version:	1.18.1.4
 Epoch:		1
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/Publishing
 Source0:	ftp://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz
@@ -44,17 +44,30 @@
 Patch14:	%{name}-sectmp.patch
 Patch15:	%{name}-spacefix.patch
 URL:		http://www.gnu.org/software/groff/
-%{?with_xditview:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf
 BuildRequires:	libstdc++-devel
-%{?with_xditview:BuildRequires:	netpbm-progs}
 BuildRequires:	texinfo >= 4.5
+%if %{with xditview}
+BuildRequires:	libxcb-devel
+BuildRequires:	netpbm-progs
+BuildRequires:	xorg-lib-libICE-devel
+BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXau-devel
+BuildRequires:	xorg-lib-libXaw-devel
+BuildRequires:	xorg-lib-libXdmcp-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXp-devel
+BuildRequires:	xorg-lib-libXpm-devel
+BuildRequires:	xorg-lib-libXt-devel
+%endif
 Requires:	mktemp
 Obsoletes:	groff-tools
 Obsoletes:	groff-for-man
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_appdefsdir	/usr/X11R6/lib/X11/app-defaults
+%define		_appdefsdir	/usr/share/X11/app-defaults
 
 %description
 Groff is a document formatting system. Groff takes standard text and
@@ -259,7 +272,8 @@
 %{__make} -j1 -C src/xditview install install.man \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir} \
-	MANDIR=%{_mandir}/man1
+	MANDIR=%{_mandir}/man1 \
+	XAPPLOADDIR=%{_appdefsdir}
 %endif
 
 ln -sf s.tmac	$RPM_BUILD_ROOT%{_datadir}/groff/%{version}/tmac/gs.tmac
@@ -458,6 +472,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2007/02/15 15:43:40  qrczak
+- BReq and app-defaults dir changed from X11R6 to X.org.
+- Release 2
+
 Revision 1.80  2007/02/13 07:16:47  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/groff.spec?r1=1.80&r2=1.81&f=u