[libunistring] adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20
Pádraig Brady
pbrady at fedoraproject.org
Fri Aug 30 01:48:14 UTC 2013
commit c84538f98973e5280391b41481e47efed0a61d76
Author: Pádraig Brady <P at draigBrady.com>
Date: Fri Aug 30 02:45:22 2013 +0100
adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20
Resolves rhbz#1001267
libunistring.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/libunistring.spec b/libunistring.spec
index 3a94dc8..3b035fd 100644
--- a/libunistring.spec
+++ b/libunistring.spec
@@ -1,6 +1,6 @@
Name: libunistring
Version: 0.9.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Group: System Environment/Libraries
Summary: GNU Unicode string library
License: LGPLv3+
@@ -37,6 +37,8 @@ make %{?_smp_mflags}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}.la
+# Move staged docs so not picked up by %%doc in main package
+mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name} __doc
%clean
rm -rf $RPM_BUILD_ROOT
@@ -49,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%doc HACKING DEPENDENCIES THANKS ChangeLog
-%doc %{_datadir}/doc/%{name}/*.html
+%doc __doc/*
%{_infodir}/%{name}.info*
%{_libdir}/%{name}.so
%{_includedir}/unistring
@@ -68,6 +70,9 @@ if [ $1 = 0 ]; then
fi
%changelog
+* Thu Aug 29 2013 Pádraig Brady <P at draigBrady.com> 0.9.3-9
+- Adjust to avoid duplicate docs caused by %%doc macro changes in Fedora 20
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list