rpms/nx/FC-5 nx.spec,1.4,1.5

[Richard A. Stout (zipsonic)]

Author: zipsonic

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

Modified Files:
	nx.spec 
Log Message:

fixed documentation directory problems. BZ#194964



Index: nx.spec
===================================================================
RCS file: /cvs/extras/rpms/nx/FC-5/nx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nx.spec	11 Jun 2006 02:37:37 -0000	1.4
+++ nx.spec	13 Jun 2006 17:40:36 -0000	1.5
@@ -134,18 +134,18 @@
 popd
 %endif
 # install scripts
-mkdir -p %{buildroot}/%{_datadir}/doc/packages/NX
-cp -r nxscripts %{buildroot}/%{_datadir}/doc/packages/NX
+mkdir -p %{buildroot}/%{_datadir}/doc/%{name}-%{version}
+cp -r nxscripts %{buildroot}/%{_datadir}/doc/%{name}-%{version}
 # documentation and license
-tar xjf %{SOURCE10} -C %{buildroot}/%{_datadir}/doc/packages/NX
-install -m 644 nxcomp/LICENSE   %{buildroot}/%{_datadir}/doc/packages/NX
+tar xjf %{SOURCE10} -C %{buildroot}/%{_datadir}/doc/%{name}-%{version}
+install -m 644 nxcomp/LICENSE   %{buildroot}/%{_datadir}/doc/%{name}-%{version}
 for i in nxcomp nxdesktop; do
-  mkdir %{buildroot}/%{_datadir}/doc/packages/NX/$i
+  mkdir %{buildroot}/%{_datadir}/doc/%{name}-%{version}/$i
 done
-install -m 644 nxcomp/README    %{buildroot}/%{_datadir}/doc/packages/NX/nxcomp
-install -m 644 nxdesktop/README %{buildroot}/%{_datadir}/doc/packages/NX/nxdesktop
+install -m 644 nxcomp/README    %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxcomp
+install -m 644 nxdesktop/README %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxdesktop
 rm -rf nxdesktop/doc/CVS
-cp -r nxdesktop/doc %{buildroot}/%{_datadir}/doc/packages/NX/nxdesktop
+cp -r nxdesktop/doc %{buildroot}/%{_datadir}/doc/%{name}-%{version}/nxdesktop
 
 %post
 %{_sbindir}/semanage fcontext -f -- -a -t textrel_shlib_t '%{_libdir}/NX/lib/libXcomp.so.1.5.0' 2>/dev/null || :
@@ -169,10 +169,9 @@
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/packages/NX
+%doc %{_datadir}/doc/%{name}-%{version}
 %{_bindir}/*
 %dir %{_libdir}/NX
-#%dir %{_libdir}/NX/lib
 %{_libdir}/NX/*
 %ifnarch ppc ppc64 s390 s390x
 %dir %{_datadir}/NX
@@ -181,9 +180,11 @@
 %endif
 
 %changelog
+* Tue Jun 13 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-11
+- fixed documentation directory problems BZ#194964
 * Sat Jun 10 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-10
 - added Source11 to filter find-provides from showing libraries that should not
-  be provided to the system.
+  be provided to the system. BZ#194652
 * Wed Jun 07 2006 Rick Stout <zipsonic[AT]gmail.com> - 1.5.0-9
 - added Dist tag
 - fixed macro/variable inconsistencies