commit cmake for openSUSE:Factory
Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at Tue May 25 18:31:45 CEST 2010. -------- New Changes file: --- /dev/null 2010-05-08 11:31:08.000000000 +0200 +++ cmake/cmake-gui.changes 2010-05-25 16:16:25.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue May 25 14:12:51 UTC 2010 - puzel@novell.com + +- split cmake into two spec files: cmake and cmake-gui, so that + cmake build does not depend on libqt4 --- cmake/cmake.changes 2010-03-18 11:25:39.000000000 +0100 +++ cmake/cmake.changes 2010-05-18 14:18:26.000000000 +0200 @@ -1,0 +2,6 @@ +Tue May 18 12:17:02 UTC 2010 - puzel@novell.com + +- split cmake-gui into different specfile so that cmake + build does not depend on libqt4 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- cmake-gui.changes cmake-gui.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ # # spec file for package cmake-gui (Version 2.8.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: cmake-gui Version: 2.8.1 Release: 2 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ Source0: cmake-%{version}.tar.bz2 Patch4: cmake-disable-builtin-chrpath.diff Patch5: fortify-buffer-overflows.diff Summary: CMake graphical user interface BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: libqt4-devel BuildRequires: openssl-devel BuildRequires: update-desktop-files BuildRequires: zlib-devel Requires: cmake %description This is a Graphical User Interface for CMake, a cross-platform, open-source make system. Authors: -------- Kitware, Inc., Insight Consortium %prep %setup -q -n cmake-%{version} %patch4 %patch5 %build EXTRA_FLAGS="--qt-gui" export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$CXXFLAGS" ./configure \ --prefix=%{_prefix} \ --datadir=/share/cmake \ --docdir=/share/doc/packages/cmake \ --mandir=/share/man \ --system-libs \ --parallel=0%jobs \ --qt-gui make VERBOSE=1 %{?jobs:-j %jobs} %install make DESTDIR=%{buildroot} install mkdir -p %{buildroot}%{_libdir}/cmake %suse_update_desktop_file CMake Development IDE Tools Qt # delete files that belong to the 'cmake' package rm -rf %{buildroot}/usr/bin/{cpack,cmake,ctest} rm -rf %{buildroot}/usr/share/cmake rm -rf %{buildroot}/usr/share/doc/packages/cmake rm -rf %{buildroot}/usr/share/man/man1/{cmake,cmakecommands,cmakecompat}.1 rm -rf %{buildroot}/usr/share/man/man1/{cmakemodules,cmakepolicies,cmakeprops,cmakevars,cpack,ctest}.1 %clean rm -rf %{buildroot} %files %defattr(-,root,root) %{_bindir}/cmake-gui %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml %{_datadir}/pixmaps/CMakeSetup32.png %doc %{_mandir}/man1/cmake-gui.1.* %changelog ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.OgnMje/_old 2010-05-25 18:31:05.000000000 +0200 +++ /var/tmp/diff_new_pack.OgnMje/_new 2010-05-25 18:31:05.000000000 +0200 @@ -20,7 +20,7 @@ Name: cmake Version: 2.8.1 -Release: 1 +Release: 2 License: BSD3c Group: Development/Tools/Building Url: http://www.cmake.org/ @@ -29,10 +29,13 @@ Patch5: fortify-buffer-overflows.diff Summary: Cross-platform, open-source make system BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1020 -BuildRequires: fdupes libexpat-devel libqt4-devel update-desktop-files -%endif -BuildRequires: curl-devel expat gcc-c++ ncurses-devel openssl-devel zlib-devel +BuildRequires: fdupes +BuildRequires: curl-devel +BuildRequires: gcc-c++ +BuildRequires: libexpat-devel +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: zlib-devel Requires: make %description @@ -42,33 +45,12 @@ -------- Kitware, Inc., Insight Consortium -%if 0%{?suse_version} > 1020 - -%package gui -License: BSD3c -Summary: CMake Graphical User Interface -Group: Development/Tools/Building - -%description gui -This is a Graphical User Interface for CMake, a cross-platform, -open-source make system. - -Authors: --------- - Kitware, Inc., Insight Consortium - -%endif - %prep -%setup -q -n %name-%version +%setup -q -n %{name}-%{version} %patch4 %patch5 %build -EXTRA_FLAGS="" -%if 0%{?suse_version} > 1020 - EXTRA_FLAGS="--qt-gui" -%endif export CXXFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$CXXFLAGS" ./configure \ @@ -77,50 +59,38 @@ --docdir=/share/doc/packages/%{name} \ --mandir=/share/man \ --system-libs \ - --parallel=0%jobs $EXTRA_FLAGS + --parallel=0%jobs \ + --no-qt-gui make VERBOSE=1 %{?jobs:-j %jobs} %install make DESTDIR=%{buildroot} install -mkdir -p %{buildroot}%_libdir/cmake +mkdir -p %{buildroot}%{_libdir}/cmake find %{buildroot}/usr/share/cmake -type f -print0 | xargs -0 chmod 644 cp ChangeLog.manual %{buildroot}/usr/share/doc/packages/%{name}/Changelog -%if 0%{?suse_version} > 1020 -%suse_update_desktop_file CMake Development IDE Tools Qt %fdupes %buildroot/usr/share/cmake -%endif %clean rm -rf %{buildroot} %files %defattr(-,root,root) -/usr/bin/cpack -/usr/bin/cmake -/usr/bin/ctest -/usr/bin/ccmake -/usr/share/cmake +%{_bindir}/cpack +%{_bindir}/cmake +%{_bindir}/ctest +%{_bindir}/ccmake +%{_datadir}/cmake %_libdir/cmake -%doc /usr/share/doc/packages/%name -%doc %_mandir/man1/cmakepolicies.1.* -%doc %_mandir/man1/cmake.1.* -%doc %_mandir/man1/ctest.1.* -%doc %_mandir/man1/ccmake.1.* -%doc %_mandir/man1/cmakecommands.1.* -%doc %_mandir/man1/cmakecompat.1.* -%doc %_mandir/man1/cmakemodules.1.* -%doc %_mandir/man1/cmakeprops.1.* -%doc %_mandir/man1/cmakevars.1.* -%doc %_mandir/man1/cpack.1.* -%if 0%{?suse_version} > 1020 -%doc %_mandir/man1/cmake-gui.1.* - -%files gui -%defattr(-,root,root) -/usr/bin/cmake-gui -/usr/share/applications/CMake.desktop -/usr/share/mime/packages/cmakecache.xml -/usr/share/pixmaps/CMakeSetup32.png -%endif +%doc %{_defaultdocdir}/%{name} +%doc %{_mandir}/man1/cmakepolicies.1.* +%doc %{_mandir}/man1/cmake.1.* +%doc %{_mandir}/man1/ctest.1.* +%doc %{_mandir}/man1/ccmake.1.* +%doc %{_mandir}/man1/cmakecommands.1.* +%doc %{_mandir}/man1/cmakecompat.1.* +%doc %{_mandir}/man1/cmakemodules.1.* +%doc %{_mandir}/man1/cmakeprops.1.* +%doc %{_mandir}/man1/cmakevars.1.* +%doc %{_mandir}/man1/cpack.1.* %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de