- some FHS compliance, added *.la to -devel; release 0.8

Changed files:
    openmotif.spec -> 1.43

diff --git a/openmotif.spec b/openmotif.spec
index 4cdce4640cc17e4b7ed7433c9d4ecb2908100064..3efdbc0e0e5396caed6449431958e9b647cbdc18 100644 (file)
--- a/openmotif.spec
+++ b/openmotif.spec
@@ -2,7 +2,7 @@ Summary:        OpenMotif
 Summary(pl):   OpenMotif
 Name:          openmotif
 Version:       2.2.2
-Release:       0.7
+Release:       0.8
 License:       Open Group Public License
 Group:         X11/Libraries
 Source0:       ftp://openmotif.opengroup.org/pub/openmotif/R2.2/tars/%{name}-%{version}.tgz
@@ -34,6 +34,11 @@ Provides:    motif = 2.2
 #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
+
 %description
 Motif is the user interface standart in the Enterprise for
 applications that run on UNIX platforms for Sun, HP, IBM, Compaq, SGI,
@@ -147,7 +152,6 @@ mwmrc oraz zasoby Mwm.
 #%endif
 
 %build
-rm -f missing
 %{__libtoolize}
 #%%{__gettextize}
 %{__aclocal}
@@ -169,12 +173,13 @@ rm -f missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d \
-    $RPM_BUILD_ROOT%{_examplesdir}/motif \
-    $RPM_BUILD_ROOT/etc/{sysconfig/wmstyle,X11/mwm} \
-    $RPM_BUILD_ROOT%{_datadir}/xsessions
+install -d $RPM_BUILD_ROOT{%{_examplesdir}/motif,%{_datadir}/xsessions} \
+       $RPM_BUILD_ROOT/etc/{sysconfig/wmstyle,X11/mwm}
 
-%{__make} install DESTDIR="$RPM_BUILD_ROOT"
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       bmdir=%{xbitmapsdir} \
+       binddir=%{xlibdir}/bindings
 #      INSTBINFLAGS="-m 755" \
 #      INSTPGMFLAGS="-m 755" \
 #      RAWCPP="/lib/cpp" \
@@ -212,8 +217,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE COPYRIGHT.MOTIF OPENBUGS RELNOTES
 #%dir %{_libdir}/X11/uid
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_includedir}/X11/bitmaps/*
-%{_libdir}/X11/bindings
+%{xbitmapsdir}/*
+%{xlibdir}/bindings
 
 %files clients
 %defattr(644,root,root,755)
@@ -225,6 +230,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/Mrm
 %{_includedir}/Xm
 %{_includedir}/uil