- added using %%{rpmcflags} macro.

[packages/Xaw3d.git] / Xaw3d.spec

diff --git a/Xaw3d.spec b/Xaw3d.spec
index cdc6b329cd7c8c3b161a65e12c447471699ef7a7..e1706a42beef4d3de176fb7e5c339e0a12b30dd2 100644 (file)
--- a/Xaw3d.spec
+++ b/Xaw3d.spec
@@ -1,16 +1,21 @@
-Summary:       X athena widgets in 3d
-Summary(de):   X-Athena-Widgets in 3D 
+Summary:       A version of the MIT Athena widget set for X
+Summary(de):   3D-Version des MIT Athena-Widgetsatzes fuer X
 Summary(fr):   Widgets X Athena en 3D
 Summary(pl):   Biblioteka X athena widgets (wersja 3D)
 Summary(tr):   3D X Athena arayüz elemanlarý (widgets)
 Name:          Xaw3d
 Version:       1.5
-Release:       4
+Release:       10
 Group:         X11/Libraries
+Group(de):     X11/Libraries
 Group(pl):     X11/Biblioteki
 Copyright:     MIT
 Source0:       ftp://ftp.x.org/contrib/widgets/Xaw3d/R6.3/%{name}-%{version}.tar.gz
-Patch0:                Xaw3d-glibc.patch
+Patch0:                %{name}-glibc.patch
+Patch1:                %{name}-shlib.patch
+Patch2:                %{name}.patch
+Patch3:                %{name}-static.patch
+Patch4:                %{name}-ia64.patch
 Prereq:                fileutils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -43,11 +48,12 @@ yaparak), 
 
 %package devel
 Summary:       Files for developing programs that use Xaw3d
-Summary(de):   Dateien zur Entwicklung von Programmen, die Xaw3d benutzen 
+Summary(de):   Header und statische Libraries fuer Xaw3d-Entwicklung
 Summary(fr):   Fichiers pour développer des programmes utilisant Xaw3d
 Summary(pl):   Pliki potrzebne przy kompilacji programów u¿ywaj±cych Xaw3d
 Summary(tr):   Xaw3d kitaplýðýný kullanan programlar geliþtirmek için gerekli dosyalar
 Group:         X11/Libraries
+Group(de):     X11/Libraries
 Group(pl):     X11/Biblioteki
 Requires:      %{name} = %{version}
 
@@ -85,6 +91,7 @@ wykorzystuj
 Summary:       Xaw3d static library
 Summary(pl):   Biblioteki statyczne Xaw3d
 Group:         X11/Libraries
+Group(de):     X11/Libraries
 Group(pl):     X11/Biblioteki
 Requires:      %{name}-devel = %{version}
 
@@ -112,16 +119,19 @@ Ten pakiet zawiera biblioteki statyczne dla Xaw3d.
 
 %prep
 %setup -q -c
-%patch -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-export PATH=/usr/X11R6/bin:$PATH
+export PATH=%{_bindir}:$PATH
 cd xc/lib/Xaw3d
 xmkmf
 mkdir X11; ln -s `pwd` X11/Xaw3d
-make   CDEBUGFLAGS="$RPM_OPT_FLAGS" \
-       CXXDEBUGFLAGS="$RPM_OPT_FLAGS" \
-       LDFLAGS="-s" \
+make   CDEBUGFLAGS="%{rpmcflags}" \
+       CXXDEBUGFLAGS="%{rpmcflags}" \
        EXTRA_INCLUDES=-I.
 
 %install
@@ -129,20 +139,24 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_includedir}/X11
 
 cd xc/lib/Xaw3d
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-mv    $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d \
+mv -f    $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d \
       $RPM_BUILD_ROOT%{_includedir}/Xaw3d
 ln -s ../Xaw3d $RPM_BUILD_ROOT%{_includedir}/X11/Xaw3d
 
-strip $RPM_BUILD_ROOT%{_libdir}/lib*.so.*.*
-
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%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)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*