raphgro pushed to qtlockedfile (f21). "Fix conflitting doc files"

[notifications at fedoraproject.org]

>From 5467f7606907a896a3660a3eb5bfa060993477d0 Mon Sep 17 00:00:00 2001
From: Fabio Alessandro Locati <fabiolocati at gmail.com>
Date: Thu, 14 Aug 2014 23:38:36 +0200
Subject: Fix conflitting doc files


diff --git a/qtlockedfile.spec b/qtlockedfile.spec
index ba23dc1..2ba4347 100644
--- a/qtlockedfile.spec
+++ b/qtlockedfile.spec
@@ -3,7 +3,7 @@
 Summary:    QFile extension with advisory locking functions
 Name:       qtlockedfile
 Version:    2.4
-Release:    9%{?dist}
+Release:    10%{?dist}
 Group:      System Environment/Libraries
 License:    GPLv3 or LGPLv2 with exceptions
 URL:        http://doc.qt.digia.com/solutions/4/qtlockedfile/qtlockedfile.html
@@ -72,6 +72,10 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
+cp %{SOURCE3} $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
+cp %{SOURCE4} $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,18 +88,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc README.TXT
-%doc %{_docdir}
+%doc %{_docdir}/%{name}-%{version}
 %{_qt4_libdir}/lib*.so.*
 
 %files devel
 %defattr(-,root,root,-)
 %doc doc example
-%doc %{_docdir}
+%doc %{_docdir}/%{name}-devel-%{version}
 %{_qt4_libdir}/lib*.so
 %{_qt4_headerdir}/QtSolutions/
 %{_qt4_datadir}/mkspecs/features/%{name}.prf
 
 %changelog
+* Thu Aug 14 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 2.4-10
+- Fix conflicting license files
+
 * Thu Aug 14 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 2.4-9
 - Update to Digia's repository
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qtlockedfile.git/commit/?h=f21&id=5467f7606907a896a3660a3eb5bfa060993477d0