[openlmi-networking] Fix conflict between base and -doc packages

[Radek Novacek]

commit da86e1e70528a2e38a0fdaa2c45939bae6ef0feb
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Fri Jan 24 09:05:18 2014 +0100

    Fix conflict between base and -doc packages

 openlmi-networking.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/openlmi-networking.spec b/openlmi-networking.spec
index 4ad2e64..19dab62 100644
--- a/openlmi-networking.spec
+++ b/openlmi-networking.spec
@@ -2,7 +2,7 @@
 
 Name:           openlmi-networking
 Version:        0.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        CIM providers for network management
 
 License:        LGPLv2+
@@ -63,13 +63,17 @@ make doc %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 # install the docs
+install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}
+install -m 644 README COPYING $RPM_BUILD_ROOT/%{_docdir}/%{name}
 install -m 755 -d $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/pic/
 cp -r %{_target_platform}/doc/admin/html/* $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/
 # We might not have pictures (test builds on buildbot), ignore the failure
 cp -r doc/admin/pic/*.svg $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/pic/ || :
 
 %files
-%doc README COPYING
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/README
+%doc %{_docdir}/%{name}/COPYING
 %{_libdir}/cmpi/libcmpiLMI_Networking.so
 %{_datadir}/%{name}/60_LMI_Networking.mof
 %{_datadir}/%{name}/70_LMI_NetworkingIndicationFilters.mof
@@ -78,7 +82,9 @@ cp -r doc/admin/pic/*.svg $RPM_BUILD_ROOT/%{_docdir}/%{name}/admin_guide/pic/ ||
 %attr(755, root, root) %{_libexecdir}/pegasus/cmpiLMI_Networking-cimprovagt
 
 %files doc
-%doc README COPYING
+%dir %{_docdir}/%{name}
+%doc %{_docdir}/%{name}/README
+%doc %{_docdir}/%{name}/COPYING
 %{_docdir}/%{name}/admin_guide
 
 
@@ -126,6 +132,9 @@ fi >> %logfile 2>&1
 
 
 %changelog
+* Fri Jan 24 2014 Radek Novacek <rnovacek at redhat.com> 0.2.2-2
+- Fix conflict between base and -doc packages
+
 * Wed Jan 08 2014 Radek Novacek <rnovacek at redhat.com> 0.2.2-1
 - Version 0.2.2