- use absoulte path for include dir link

[packages/Xaw3d.git] / Xaw3d.spec

diff --git a/Xaw3d.spec b/Xaw3d.spec
index bf6dbbe04232ba3d873bd8ff4c2f62b2d9af44d2..f8cca65391c9a757f09c0fabed42a31e13a86abe 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:       5
 License:       MIT
 Group:         X11/Libraries
 Source0:       ftp://ftp.visi.com/users/hawkeyd/X/%{name}-%{version}.tar.gz
@@ -21,12 +21,15 @@ Patch3:             %{name}-ia64.patch
 Patch4:                %{name}-i18n.patch
 Patch5:                %{name}-arrowscroll.patch
 URL:           http://www.visi.com/~hawkeyd/xaw3d.html
-BuildRequires: XFree86-devel
-PreReq:                fileutils
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: xorg-cf-files
+BuildRequires: xorg-lib-libXmu-devel
+BuildRequires: xorg-lib-libXpm-devel
+BuildRequires: xorg-util-imake
+Requires:      fileutils
 Obsoletes:     libXaw3d7
-
-%define                _prefix         /usr/X11R6
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 Xaw3d is an enhanced version of the MIT Athena Widget set for X
@@ -84,9 +87,10 @@ Summary(pt_BR):      Arquivos para desenvolvimento de programas que usam Xaw3d
 Summary(ru):   æÁÊÌÙ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ Xaw3d
 Summary(tr):   Xaw3d kitaplýðýný kullanan programlar geliþtirmek için gerekli dosyalar
 Summary(uk):   æÁÊÌÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ Xaw3d
-Group:         X11/Libraries
-Requires:      %{name} = %{version}
-Requires:      XFree86-devel
+Group:         X11/Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      xorg-lib-libXmu-devel
+Requires:      xorg-lib-libXpm-devel
 Obsoletes:     libXaw3d7-devel
 
 %description devel
@@ -149,13 +153,13 @@ Widget 
 
 %package static
 Summary:       Xaw3d static library
-Summary(es):   Static libraries for Xaw3d development
+Summary(es):   Bibliotecas estáticas para el desarrollo con Xaw3d
 Summary(pl):   Biblioteki statyczne Xaw3d
 Summary(pt_BR):        Bibliotecas estáticas para desenvolvimento com Xaw3d
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ Xaw3d
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ Xaw3d
-Group:         X11/Libraries
-Requires:      %{name}-devel = %{version}
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Xaw3d is an enhanced version of the MIT Athena Widget set for X
@@ -206,51 +210,45 @@ 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
+       $RPM_BUILD_ROOT%{_includedir}/Xaw3d
+ln -s %{_includedir}/Xaw3d $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
+%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
-%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