[kid3] Install -qt docs to unversioned dir if %{_docdir_fmt} is defined.

Ville Skyttä scop at fedoraproject.org
Fri Jul 26 17:33:52 UTC 2013


commit d6e71ba2c48dee7793b39b276651a2bb5515744a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jul 26 20:28:50 2013 +0300

    Install -qt docs to unversioned dir if %{_docdir_fmt} is defined.

 kid3.spec |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kid3.spec b/kid3.spec
index 675e728..60e6f75 100644
--- a/kid3.spec
+++ b/kid3.spec
@@ -1,6 +1,6 @@
 Name:           kid3
 Version:        2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient KDE ID3 tag editor
 
 License:        GPLv2+
@@ -58,7 +58,7 @@ cd ..
 
 mkdir _kid3-qt ; cd _kid3-qt
 %cmake $opts -DWITH_KDE:BOOL=OFF \
-    -DWITH_DOCDIR=share/doc/%{name}-qt-%{version} ..
+    -DWITH_DOCDIR=share/doc/%{name}-qt%{!?_docdir_fmt:-%{version}} ..
 make %{?_smp_mflags}
 cd ..
 
@@ -76,7 +76,7 @@ grep -vF kid3-qt %{name}.lang > %{name}-kde.lang
 grep -F  kid3-qt %{name}.lang > %{name}-qt.lang
 
 install -pm 644 AUTHORS ChangeLog COPYING LICENSE README \
-    $RPM_BUILD_ROOT%{_docdir}/%{name}-qt-%{version}
+    $RPM_BUILD_ROOT%{_docdir}/%{name}-qt%{!?_docdir_fmt:-%{version}}
 
 
 %post -p <lua>
@@ -119,7 +119,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/kid3.1*
 
 %files qt -f %{name}-qt.lang
-%doc %{_docdir}/%{name}-qt-%{version}/
+%doc %{_docdir}/%{name}-qt%{!?_docdir_fmt:-%{version}}/
 %{_bindir}/kid3-qt
 %{_datadir}/applications/kid3-qt.desktop
 %{_datadir}/icons/hicolor/*x*/apps/kid3-qt.png
@@ -131,6 +131,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jul 26 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.3-2
+- Install -qt docs to unversioned dir if %%{_docdir_fmt} is defined.
+
 * Thu Mar 14 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.3-1
 - Update to 2.3.
 - Patch to fix XM support.


More information about the scm-commits mailing list