[udunits2] Move doc dir to udunits2 to avoid conflicts (bug #1104766)

[Orion Poplawski]

commit ca2a9b9496ede3787a443a1b5c669f4f34a31da1
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Jun 4 10:09:16 2014 -0600

    Move doc dir to udunits2 to avoid conflicts (bug #1104766)

 udunits2.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/udunits2.spec b/udunits2.spec
index 0421ff7..4583ff1 100644
--- a/udunits2.spec
+++ b/udunits2.spec
@@ -1,6 +1,6 @@
 Name: udunits2
 Version: 2.2.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A library for manipulating units of physical quantities
 License: MIT
 Group: System Environment/Libraries
@@ -40,13 +40,14 @@ the udunits2 library.
 %setup -q -n udunits-%{version}
 
 %build
-%configure --disable-static
+%configure --disable-static --docdir %{_docdir}/%{name}
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install install-html install-pdf
 mkdir -p %{buildroot}%{_infodir}/
 install -p -m0644 %{name}.info %{buildroot}%{_infodir}
+install -p -m0644 ANNOUNCEMENT %{buildroot}%{_docdir}/%{name}/
 
 # We need to do this to avoid conflicting with udunits v1
 mkdir -p %{buildroot}%{_includedir}/%{name}/
@@ -69,19 +70,21 @@ if [ $1 = 0 ] ; then
 fi
 
 %files
-%doc ANNOUNCEMENT CHANGE_LOG COPYRIGHT README
 %{_bindir}/%{name}
 %{_datadir}/udunits/
 %{_infodir}/%{name}*.info*
 %{_libdir}/libudunits2.so.*
-%doc %{_docdir}/udunits
+%doc %{_docdir}/%{name}
 
 %files devel
 %{_includedir}/%{name}/
 %{_libdir}/libudunits2.so
 
 %changelog
-* Tue Jun 3 2014 Orion Poplawski <orion at cora.nwra.com> - 2.2.12
+* Wed Jun 4 2014 Orion Poplawski <orion at cora.nwra.com> - 2.2.12-2
+- Move doc dir to udunits2 to avoid conflicts (bug #1104766)
+
+* Tue Jun 3 2014 Orion Poplawski <orion at cora.nwra.com> - 2.2.12-1
 - Update to 2.2.12 (fixes bug #1076802 - partial expat bundling)
 - Enable tests (bug #1076799)