rpms/ncview/FC-5 ncview.spec,1.5,1.6

[Ed Hill (edhill)]

Author: edhill

Update of /cvs/extras/rpms/ncview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18522

Modified Files:
	ncview.spec 
Log Message:
cleanup app-defaults install



Index: ncview.spec
===================================================================
RCS file: /cvs/extras/rpms/ncview/FC-5/ncview.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ncview.spec	15 Nov 2006 04:33:28 -0000	1.5
+++ ncview.spec	15 Nov 2006 05:18:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           ncview
 Version:        1.92e
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A visual browser for netCDF format files
 Group:          Applications/Engineering
 License:        GPL
@@ -40,16 +40,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export XAPPLRESDIR="${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
-mkdir -p "${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults"
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
+cp Ncview-appdefaults ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
+cat > install-appdef <<EOF
+#!/bin/bash
+echo "no longer needed"
+EOF
 %makeinstall NCVIEW_LIB_DIR=${RPM_BUILD_ROOT}%{_datadir}/ncview BINDIR=${RPM_BUILD_ROOT}%{_bindir} MANDIR=${RPM_BUILD_ROOT}%{_mandir}/man1
 chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/ncview/*
-chmod 644 ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview
+chmod 644 ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults/Ncview
 chmod 644 ${RPM_BUILD_ROOT}%{_mandir}/man1/*
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
-mv ${RPM_BUILD_ROOT}%{_libdir}/X11/app-defaults/Ncview \
-   ${RPM_BUILD_ROOT}%{_datadir}/X11/app-defaults
-rm -rf ${RPM_BUILD_ROOT}%{_libdir}/X11
 
 
 %clean
@@ -61,11 +61,14 @@
 %doc README COPYING
 %{_bindir}/*
 %{_datadir}/ncview
-%{_datadir}/X11/app-defaults/*
+%{_datadir}/X11/app-defaults/Ncview
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Nov 14 2006 Ed Hill <ed at eh3.com> - 1.92e-9
+- cleanup app-defaults install (check-buildroot)
+
 * Tue Nov 14 2006 Ed Hill <ed at eh3.com> - 1.92e-8
 - bz 215632