[mlpack] Update for new F20 versioning standards.
rcurtin
rcurtin at fedoraproject.org
Tue Aug 6 14:46:26 UTC 2013
commit d81350b47ac694469ae4cd450ff8b35e663f129c
Author: Ryan Curtin <gth671b at mail.gatech.edu>
Date: Tue Aug 6 10:46:06 2013 -0400
Update for new F20 versioning standards.
mlpack.spec | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/mlpack.spec b/mlpack.spec
index 236795c..aa478fd 100644
--- a/mlpack.spec
+++ b/mlpack.spec
@@ -1,6 +1,6 @@
Name: mlpack
Version: 1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Scalable, fast C++ machine learning library
Group: System Environment/Libraries
@@ -96,6 +96,9 @@ language features to provide maximum performance and maximum flexibility for
expert users. mlpack outperforms competing machine learning libraries by large
margins. This package provides the Doxygen-generated documentation for mlpack.
+# For the F20 unversioned documentation change. This evaluates to
+# %{_pkgdocdir} if on F20 and %{_docdir}/%{name}-%{version} otherwise.
+%global our_docdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
%prep
%setup -q
@@ -122,7 +125,10 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Put the license file in place.
-mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/
+mv $RPM_BUILD_ROOT/%{_docdir}/mlpack $RPM_BUILD_ROOT/%{our_docdir}
+mkdir -p $RPM_BUILD_ROOT/%{our_docdir}
+cp LICENSE.txt $RPM_BUILD_ROOT/%{our_docdir}
+
# Rename executables to mlpack_* to avoid possible naming collisions. Upstream
# bug report http://trac.research.cc.gatech.edu/fastlab/ticket/236.
@@ -147,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/libmlpack.so.1
%{_libdir}/libmlpack.so.1.0
-%doc LICENSE.txt
+%{our_docdir}/LICENSE.txt
%files bin
%defattr(-,root,root,-)
@@ -209,9 +215,13 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root,-)
-%{_docdir}/mlpack/
+%{our_docdir}
%changelog
+* Tue Aug 06 2013 Ryan Curtin <gth671b at mail.gatech.edu> - 1.0.6-4
+- Use %{our_docdir} for F20 change to unversioned documentation directory names.
+- Do not package HTML documentation in main package.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list