[uriparser] Fix FTBS, switch to UnversionedDocdirs (#991907, #993941)

François Cami fcami at fedoraproject.org
Tue Aug 6 22:24:58 UTC 2013


commit 7ac7924840f8b71318f700198347ff603907c6c0
Author: François Cami <fcami at fedoraproject.org>
Date:   Wed Aug 7 00:24:26 2013 +0200

    Fix FTBS, switch to UnversionedDocdirs (#991907, #993941)

 uriparser.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/uriparser.spec b/uriparser.spec
index f5748b9..bf9ef42 100644
--- a/uriparser.spec
+++ b/uriparser.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
 Name:           uriparser
 Version:        0.7.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        URI parsing library - RFC 3986
 
 Group:          System Environment/Libraries
@@ -55,8 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-mv $RPM_BUILD_ROOT/%{_datadir}/doc/uriparser/html \
- $RPM_BUILD_ROOT/%{_datadir}/doc/%{name}-%{version}
+# fcami - update for https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+if [ ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name} != ${RPM_BUILD_ROOT}%{_pkgdocdir} ]
+  then mv ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/html ${RPM_BUILD_ROOT}%{_pkgdocdir}
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Aug 06 2013 François Cami <fcami at fedoraproject.org> - 0.7.8-2
+- Fix FTBFS due to https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+  (#991907, #993941).
+
 * Tue Jul 30 2013 François Cami <fcami at fedoraproject.org> - 0.7.8-1
 - Update to 0.7.8
 


More information about the scm-commits mailing list