SPECS: openmotif.spec - adapted for modular xorg.

[pluto]

Author: pluto                        Date: Fri Feb  3 21:55:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapted for modular xorg.

---- Files affected:
SPECS:
   openmotif.spec (1.64 -> 1.65) 

---- Diffs:

================================================================
Index: SPECS/openmotif.spec
diff -u SPECS/openmotif.spec:1.64 SPECS/openmotif.spec:1.65
--- SPECS/openmotif.spec:1.64	Wed Dec 28 19:21:13 2005
+++ SPECS/openmotif.spec	Fri Feb  3 22:55:00 2006
@@ -26,13 +26,13 @@
 Patch4:		%{name}-bison.patch
 Patch5:		%{name}-CVE-2005-3964.patch
 URL:		http://www.openmotif.org/
-BuildRequires:	XFree86
-BuildRequires:	XFree86-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	libtool
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXp-devel
 Requires:	%{name}-libs = %{version}-%{release}
 Provides:	motif = 2.2
 # Not restricted, lesstif provided library version 1.2
@@ -40,10 +40,10 @@
 #Obsoletes:	lesstif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# FHS compliance
-# (software must not be installed through /usr/{lib,include}/X11 links)
-%define		xbitmapsdir	/usr/X11R6/include/X11/bitmaps
-%define		xlibdir		/usr/X11R6/lib/X11
+%define		specflags	-fno-strict-aliasing
+
+%define		xbitmapsdir	%{_includedir}/X11/bitmaps
+%define		xlibdir		%{_libdir}/X11
 
 %description
 Motif is the user interface standart in the Enterprise for
@@ -73,7 +73,8 @@
 Summary(pl):	Pliki nagłówkowe OpenMotif
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	XFree86-devel
+Requires:	xorg-lib-libXmu-devel
+Requires:	xorg-lib-libXp-devel
 Provides:	motif-devel = 2.1
 Obsoletes:	lesstif-devel
 
@@ -285,6 +286,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.65  2006/02/03 21:55:00  pluto
+- adapted for modular xorg.
+
 Revision 1.64  2005/12/28 18:21:13  adamg
 - fix for CVE-2005-3964 (buffer overflows in libUil)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openmotif.spec?r1=1.64&r2=1.65&f=u