From 0f9f65890ee318fcb679be2a19f02655974df32e Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 7 Mar 2008 16:54:42 +0000 Subject: [PATCH] Undo wxWidgets changes that accidentally got checked in. Add macro for bootstrapping --- cmake.spec | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/cmake.spec b/cmake.spec index 8969fab..3db8c80 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,3 +1,7 @@ +# Set to bcond_without or use --with bootstrap if bootstrapping a new release +# or architecture +%bcond_with bootstrap + Name: cmake Version: 2.4.8 Release: 3%{?dist} @@ -11,15 +15,10 @@ Source1: cmake-init-fedora Source2: macros.cmake Patch0: cmake-2.4.2-fedora.patch Patch1: cmake-2.4.5-xmlrpc.patch -Patch2: cmake-2.4.8-CMakeSetup-unicode.patch -Patch3: cmake-2.4.8-wxdialog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, libX11-devel -BuildRequires: curl-devel, expat-devel, zlib-devel, wxGTK-devel -# To bootstrap on a new architecture/release, you must comment out the -# xmlrpc-c-devel BR and xmlrpc patch. Build cmake then xmlrpc-c. Then -# undo the cmake changes and rebuild cmake. -BuildRequires: xmlrpc-c-devel +BuildRequires: curl-devel, expat-devel, zlib-devel +%{?!with_bootstrap:BuildRequires: xmlrpc-c-devel} Requires: rpm @@ -32,21 +31,10 @@ to support complex environments requiring system configuration, pre-processor generation, code generation, and template instantiation. -%package -n cmakesetup -Summary: CMakeSetup -Group: Development/Tools -Requires: %{name} = %{version}-%{release} - -%description -n cmakesetup -wxWidgets based CMake tool. - - %prep %setup -q %patch -p1 -b .fedora %patch1 -p1 -b .xmlrpc -%patch2 -p1 -b .unicode -%patch3 -p1 -b .wxdialog %build @@ -54,7 +42,7 @@ export CFLAGS="$RPM_OPT_FLAGS" export CXXFLAGS="$RPM_OPT_FLAGS" ./bootstrap --init=%SOURCE1 --prefix=%{_prefix} --datadir=/share/%{name} \ --docdir=/share/doc/%{name}-%{version} --mandir=/share/man \ - --system-libs + --%{?with_bootstrap:no-}system-libs make VERBOSE=1 %{?_smp_mflags} @@ -86,14 +74,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/*.1* %{_datadir}/emacs/ -%files -n cmakesetup -%defattr(-,root,root,-) -%{_bindir}/CMakeSetup - %changelog -* Fri Feb 8 2008 Laurent Rineau - 2.4.8-3 -- Enable the wxWidgets version of CMakeSetup (bug #431953). +* Fri Mar 7 2008 Orion Poplawski - 2.4.8-3 +- Add macro for bootstrapping new release/architecture * Tue Feb 19 2008 Fedora Release Engineering - 2.4.8-2 - Autorebuild for GCC 4.3