X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Xaw3d.spec;h=f8cca65391c9a757f09c0fabed42a31e13a86abe;hb=4b4334d1f4cbc5c33c66fd07664d0c18955ab5fd;hp=5440832474cd05a9d1f7e649a113bb86126e2886;hpb=7d13d22ed8f90f6f15ac64b10161a61f2057f2b9;p=packages%2FXaw3d.git

diff --git a/Xaw3d.spec b/Xaw3d.spec
index 5440832..f8cca65 100644
--- 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:	4
+Release:	5
 License:	MIT
 Group:		X11/Libraries
 Source0:	ftp://ftp.visi.com/users/hawkeyd/X/%{name}-%{version}.tar.gz
@@ -24,12 +24,12 @@ URL:		http://www.visi.com/~hawkeyd/xaw3d.html
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	xorg-cf-files
-BuildRequires:	xorg-lib-libXmu
-BuildRequires:	xorg-lib-libXpm
+BuildRequires:	xorg-lib-libXmu-devel
+BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-util-imake
 Requires:	fileutils
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	libXaw3d7
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Xaw3d is an enhanced version of the MIT Athena Widget set for X
@@ -89,7 +89,8 @@ Summary(tr):	Xaw3d kitapl
 Summary(uk):	æÁÊÌÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ Xaw3d
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	XFree86-devel
+Requires:	xorg-lib-libXmu-devel
+Requires:	xorg-lib-libXpm-devel
 Obsoletes:	libXaw3d7-devel
 
 %description devel
@@ -209,27 +210,27 @@ Widget 
 %patch5
 
 %build
-export PATH=%{_bindir}:$PATH
 cd xc/lib/Xaw3d
 xmkmf
 mkdir X11; ln -s `pwd` X11/Xaw3d
+# kill unneeded -lXp from EXTRAXAWREQS
 %{__make} \
 	CC="%{__cc}" \
 	CDEBUGFLAGS="%{rpmcflags}" \
-	CXXDEBUGFLAGS="%{rpmcflags}" \
-	EXTRA_INCLUDES=-I.
+	SHLIBGLOBALSFLAGS="%{rpmldflags}" \
+	EXTRA_INCLUDES=-I. \
+	EXTRAXAWREQS=
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/X11
 
-cd xc/lib/Xaw3d
-%{__make} install \
+%{__make} -C xc/lib/Xaw3d install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 mv -f $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d \
 	$RPM_BUILD_ROOT%{_includedir}/Xaw3d
-ln -s ../Xaw3d $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d
+ln -s %{_includedir}/Xaw3d $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -240,14 +241,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc xc/lib/Xaw3d/README.XAW3D
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libXaw3d.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libXaw3d.so
 %{_includedir}/Xaw3d
 %{_includedir}/X11/Xaw3d
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libXaw3d.a