- xorg modular deps, rel 4

Changed files:
    Xaw3d.spec -> 1.43

diff --git a/Xaw3d.spec b/Xaw3d.spec
index c793ea61d2b05533c3386ba381f955b38cbd81da..e09275ada4f485cb94b1e4b9c574b875f059d767 100644 (file)
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -9,7 +9,7 @@ Summary(tr):    3D X Athena aray
 Summary(uk):   ÷ÅÒÓ¦Ñ MIT Athena widget set ÄÌÑ X
 Name:          Xaw3d
 Version:       1.5E
-Release:       3
+Release:       4
 License:       MIT
 Group:         X11/Libraries
 Source0:       ftp://ftp.visi.com/users/hawkeyd/X/%{name}-%{version}.tar.gz
@@ -21,15 +21,14 @@ Patch3:             %{name}-ia64.patch
 Patch4:                %{name}-i18n.patch
 Patch5:                %{name}-arrowscroll.patch
 URL:           http://www.visi.com/~hawkeyd/xaw3d.html
-BuildRequires: XFree86-devel
 BuildRequires: bison
 BuildRequires: flex
+BuildRequires: xorg-lib-libXmu
+BuildRequires: xorg-lib-libXpm
 Requires:      fileutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libXaw3d7
 
-%define                _prefix         /usr/X11R6
-
 %description
 Xaw3d is an enhanced version of the MIT Athena Widget set for X
 Window that adds a 3-dimensional look to the applications with
@@ -236,12 +235,6 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%triggerpostun devel -- Xaw3d-devel < 1.5-5
-if [ -d /usr/X11R6/include/Xaw3d ]; then
-       rm -rf /usr/X11R6/include/Xaw3d
-       ln -sf X11/Xaw3d /usr/X11R6/include
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc xc/lib/Xaw3d/README.XAW3D