[cmake] Use version-less docdir
Orion Poplawski
orion at fedoraproject.org
Fri Jul 26 23:15:04 UTC 2013
commit a96004dd80b186701213c7d5e570aa2628d80e14
Author: Orion Poplawski <orion at nwra.com>
Date: Fri Jul 26 17:14:37 2013 -0600
Use version-less docdir
cmake.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index 2a5177c..9e663ca 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
Name: cmake
Version: 2.8.11.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Cross-platform make system
Group: Development/Tools
@@ -113,7 +113,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS"
mkdir build
pushd build
../bootstrap --prefix=%{_prefix} --datadir=/share/%{name} \
- --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \
+ --docdir=/share/doc/%{name} --mandir=/share/man \
--%{?with_bootstrap:no-}system-libs \
--parallel=`/usr/bin/getconf _NPROCESSORS_ONLN` \
%{?qt_gui}
@@ -166,9 +166,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%files
%{rpm_macros_dir}/macros.cmake
-%{_docdir}/%{name}-%{version}/
+%{_docdir}/%{name}/
%if %{with gui}
-%exclude %{_docdir}/%{name}-%{version}/cmake-gui.*
+%exclude %{_docdir}/%{name}/cmake-gui.*
%endif
%{_bindir}/ccmake
%{_bindir}/cmake
@@ -191,7 +191,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%if %{with gui}
%files gui
-%{_docdir}/%{name}-%{version}/cmake-gui.*
+%{_docdir}/%{name}/cmake-gui.*
%{_bindir}/cmake-gui
%{_datadir}/applications/CMake.desktop
%{_datadir}/mime/packages/cmakecache.xml
@@ -201,6 +201,9 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
%changelog
+* Fri Jul 26 2013 Orion Poplawski <orion at cora.nwra.com> - 2.8.11.2-4
+- Use version-less docdir
+
* Thu Jul 25 2013 Petr Machata <pmachata at redhat.com> - 2.8.11.2-3
- Icon name in desktop file should be sans .png extension.
More information about the scm-commits
mailing list