[ViTables] Fix duplicate docs issue
Thibault North
tnorth at fedoraproject.org
Thu Oct 17 02:21:29 UTC 2013
commit e9c5e173e95e491aefd72edf5018a4fc929882d9
Author: Thibault North <tnorth at fedoraproject.org>
Date: Wed Oct 16 22:20:54 2013 -0400
Fix duplicate docs issue
ViTables.spec | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/ViTables.spec b/ViTables.spec
index e373790..abc7883 100644
--- a/ViTables.spec
+++ b/ViTables.spec
@@ -1,7 +1,7 @@
Summary: Viewer for Hierarchical Datafiles (HDF5)
Name: ViTables
Version: 2.1
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv3
Group: Development/Tools
URL: http://www.vitables.org/
@@ -39,15 +39,12 @@ python setup.py build
%install
python setup.py install -O1 --skip-build --root=%{buildroot}
-# Add docs
-mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -pr examples/ %{buildroot}%{_docdir}/%{name}/
-cp -pr doc/UsersGuide.pdf %{buildroot}%{_docdir}/%{name}/
-
-
%clean
rm -rf %{buildroot}
+# force the directory to be the same for ViTables and ViTables-doc
+%global _docdir_fmt %{name}
+
%files
%doc ANNOUNCE.txt README.txt TODO.txt LICENSE.txt
%{_bindir}/vitables
@@ -55,11 +52,13 @@ rm -rf %{buildroot}
%{python_sitelib}/%{name}-%{version}-py*.egg-info
%files doc
-%dir %{_docdir}/%{name}
-%doc %{_docdir}/%{name}/examples
-%doc %{_docdir}/%{name}/UsersGuide.pdf
+%doc examples/
+%doc doc/UsersGuide.pdf
%changelog
+* Wed Oct 16 2013 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 2.1-7
+- Fix for https://fedoraproject.org/wiki/Changes/UnversionedDocdirs
+
* Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list