From a83de16c5abb7b50358b36c7caf653396e515edbb4f3849d8f5ed48e7b0c071e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Tue, 25 May 2010 16:31:48 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/cmake revision 36.0 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=420ae3655759511d308019b592abc424 --- cmake-gui.changes | 5 +++ cmake-gui.spec | 92 +++++++++++++++++++++++++++++++++++++++++++++++ cmake.changes | 6 ++++ cmake.spec | 86 +++++++++++++++----------------------------- 4 files changed, 131 insertions(+), 58 deletions(-) create mode 100644 cmake-gui.changes create mode 100644 cmake-gui.spec diff --git a/cmake-gui.changes b/cmake-gui.changes new file mode 100644 index 0000000..294fc99 --- /dev/null +++ b/cmake-gui.changes @@ -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 diff --git a/cmake-gui.spec b/cmake-gui.spec new file mode 100644 index 0000000..3997aeb --- /dev/null +++ b/cmake-gui.spec @@ -0,0 +1,92 @@ +# +# 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 diff --git a/cmake.changes b/cmake.changes index 166f22f..39e90c8 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Mar 18 10:23:53 UTC 2010 - puzel@novell.com diff --git a/cmake.spec b/cmake.spec index e1efaef..53eecd7 100644 --- a/cmake.spec +++ b/cmake.spec @@ -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 @@ Patch4: cmake-disable-builtin-chrpath.diff 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 @@ Authors: -------- 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 @@ export CFLAGS="$CXXFLAGS" --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