packages: cmake/cmake.spec - pass --qt-qmake (fixes build when qt3 qmake is...
qboosh
qboosh at pld-linux.org
Thu Nov 11 07:11:14 CET 2010
Author: qboosh Date: Thu Nov 11 06:11:14 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- pass --qt-qmake (fixes build when qt3 qmake is also installed)
- moved cmake-gui(1) man page to proper package
---- Files affected:
packages/cmake:
cmake.spec (1.52 -> 1.53)
---- Diffs:
================================================================
Index: packages/cmake/cmake.spec
diff -u packages/cmake/cmake.spec:1.52 packages/cmake/cmake.spec:1.53
--- packages/cmake/cmake.spec:1.52 Fri Nov 5 12:36:13 2010
+++ packages/cmake/cmake.spec Thu Nov 11 07:11:09 2010
@@ -87,6 +87,7 @@
--init=init.cmake \
%{!?with_bootstrap:--system-libs} \
%{?with_gui:--qt-gui} \
+ --qt-qmake=/usr/bin/qmake-qt4 \
--verbose
%{__make} VERBOSE=1
@@ -109,7 +110,16 @@
%attr(755,root,root) %{_bindir}/cmake
%attr(755,root,root) %{_bindir}/cpack
%attr(755,root,root) %{_bindir}/ctest
-%{_mandir}/man1/*.1*
+%{_mandir}/man1/ccmake.1*
+%{_mandir}/man1/cmake.1*
+%{_mandir}/man1/cmakecommands.1*
+%{_mandir}/man1/cmakecompat.1*
+%{_mandir}/man1/cmakemodules.1*
+%{_mandir}/man1/cmakepolicies.1*
+%{_mandir}/man1/cmakeprops.1*
+%{_mandir}/man1/cmakevars.1*
+%{_mandir}/man1/cpack.1*
+%{_mandir}/man1/ctest.1*
%{_datadir}/cmake
%dir %{_libdir}/cmake
@@ -120,6 +130,7 @@
%{_datadir}/mime/packages/cmakecache.xml
%{_desktopdir}/CMake.desktop
%{_pixmapsdir}/CMakeSetup32.png
+%{_mandir}/man1/cmake-gui.1*
%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -128,6 +139,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.53 2010/11/11 06:11:09 qboosh
+- pass --qt-qmake (fixes build when qt3 qmake is also installed)
+- moved cmake-gui(1) man page to proper package
+
Revision 1.52 2010/11/05 11:36:13 glen
- adapter
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cmake/cmake.spec?r1=1.52&r2=1.53&f=u
More information about the pld-cvs-commit
mailing list