rpms/nfs-utils-lib/F-8 nfs-utils-lib.spec,1.23,1.24

[Steve Dickson (steved)]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils-lib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25450

Modified Files:
	nfs-utils-lib.spec 
Log Message:
- Changed the file mode on documentation files (bz 427827)
- Chagned how the doc directories are created so they
  are owned by the package. (bz 211001)



Index: nfs-utils-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils-lib/F-8/nfs-utils-lib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nfs-utils-lib.spec	17 Oct 2007 17:32:49 -0000	1.23
+++ nfs-utils-lib.spec	24 Jan 2008 17:52:25 -0000	1.24
@@ -1,7 +1,7 @@
 Summary: Network File System Support Library
 Name: nfs-utils-lib
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.citi.umich.edu/projects/nfsv4/linux/
 License: GPL
 
@@ -10,6 +10,11 @@
 %define rpcsecgssvers 0.16
 %define librpcsecgss librpcsecgss
 %define libs %{librpcsecgss} %{libnfsidmap}
+
+%define _docdir             %{_defaultdocdir}/%{name}-%{version}
+%define librpcsecgss_docdir %{_docdir}/%{librpcsecgss}-%{rpcsecgssvers}
+%define libnfsidmap_docdir  %{_docdir}/%{libnfsidmap}-%{idmapvers}
+
 Source0: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/%{libnfsidmap}-%{idmapvers}.tar.gz
 Source1: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/%{librpcsecgss}-%{rpcsecgssvers}.tar.gz
 
@@ -71,14 +76,20 @@
 	popd
 done
 
-for dir in %{libs} ; do
-	mkdir -p $RPM_BUILD_ROOT/%{_usr}/share/doc/$dir
-	pushd $dir
-	for file in AUTHORS ChangeLog NEWS README ; do
-		install -m 755 $file $RPM_BUILD_ROOT%{_usr}/share/doc/$dir
-	done
-	popd
+mkdir -p %{buildroot}/%{librpcsecgss_docdir}
+pushd %{librpcsecgss}
+for file in AUTHORS ChangeLog NEWS README ; do
+	install -m 644 $file %{buildroot}/%{librpcsecgss_docdir}
 done
+popd
+
+mkdir -p %{buildroot}/%{libnfsidmap_docdir}
+pushd %{libnfsidmap}
+for file in AUTHORS ChangeLog NEWS README ; do
+	install -m 644 $file %{buildroot}/%{libnfsidmap_docdir}
+done
+popd
+
 mkdir -p %{buildroot}/etc
 install -m 644 %{libnfsidmap}/idmapd.conf $RPM_BUILD_ROOT/etc/idmapd.conf
 
@@ -92,21 +103,19 @@
 
 %files
 %defattr(-,root,root)
+%dir  %{_docdir}
+
 %{_libdir}/librpcsecgss.so.*
 %{_libdir}/librpcsecgss.la
-%{_defaultdocdir}/%{librpcsecgss}/AUTHORS
-%{_defaultdocdir}/%{librpcsecgss}/ChangeLog
-%{_defaultdocdir}/%{librpcsecgss}/NEWS
-%{_defaultdocdir}/%{librpcsecgss}/README
+%dir %{librpcsecgss_docdir}
+%{librpcsecgss_docdir}/*
 %{_libdir}/pkgconfig/librpcsecgss.pc
 
 %config(noreplace) /etc/idmapd.conf
 %{_libdir}/libnfsidmap.so.*
 %{_libdir}/libnfsidmap.la
-%{_defaultdocdir}/%{libnfsidmap}/AUTHORS
-%{_defaultdocdir}/%{libnfsidmap}/ChangeLog
-%{_defaultdocdir}/%{libnfsidmap}/NEWS
-%{_defaultdocdir}/%{libnfsidmap}/README
+%dir %{libnfsidmap_docdir}
+%{libnfsidmap_docdir}/*
 %{_libdir}/pkgconfig/libnfsidmap.pc
 %{_mandir}/man3/nfs4_uid_to_name.3.gz
 
@@ -125,6 +134,11 @@
 %{_libdir}/libnfsidmap.a
 
 %changelog
+* Thu Jan 24 2008 Steve Dickson <steved at redhat.com> 1.1.0-4
+- Changed the file mode on documentation files (bz 427827)
+- Chagned how the doc directories are created so they
+  are owned by the package. (bz 211001)
+
 * Tue Oct 16 2007 Steve Dickson <steved at redhat.com> 1.1.0-3
 - Switch the libgssapi dependency to libgssglue
 - Updated  librpcsecgss to the 0.16 release