From 386a324d9410fda5022d04fd9c3aa4083a2d6504fcd101fda1d80ae888bff4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 16 Feb 2015 11:01:37 +0000 Subject: [PATCH] Accepting request 286152 from KDE:Unstable:Frameworks Update to 3.2 rc1 OBS-URL: https://build.opensuse.org/request/show/286152 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=193 --- cmake-3.1.3.tar.gz | 3 - cmake-3.2.0-rc1.tar.gz | 3 + cmake-gui.changes | 215 +++++++++++++++++++++++++++++++++++++++++ cmake-gui.spec | 26 ++++- cmake.changes | 215 +++++++++++++++++++++++++++++++++++++++++ cmake.spec | 20 +++- form.patch | 13 +++ system-libs.patch | 15 +++ 8 files changed, 498 insertions(+), 12 deletions(-) delete mode 100644 cmake-3.1.3.tar.gz create mode 100644 cmake-3.2.0-rc1.tar.gz create mode 100644 form.patch create mode 100644 system-libs.patch diff --git a/cmake-3.1.3.tar.gz b/cmake-3.1.3.tar.gz deleted file mode 100644 index c2bb88a..0000000 --- a/cmake-3.1.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:45f4d3fa8a2f61cc092ae461aac4cac1bab4ac6706f98274ea7f314dd315c6d0 -size 5959549 diff --git a/cmake-3.2.0-rc1.tar.gz b/cmake-3.2.0-rc1.tar.gz new file mode 100644 index 0000000..9d3e301 --- /dev/null +++ b/cmake-3.2.0-rc1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50a394cf2efd9a92dd4114ebe2999489984ce6e6211b0d971930a90cbe7f0c1b +size 6436773 diff --git a/cmake-gui.changes b/cmake-gui.changes index c639d4b..30c5223 100644 --- a/cmake-gui.changes +++ b/cmake-gui.changes @@ -1,3 +1,218 @@ +------------------------------------------------------------------- +Sat Feb 14 19:48:11 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 3.2 rc1: + * New Features: + * Syntax: + * CMake learned to support unicode characters *encoded as + UTF-8* on Windows. This was already supported on platforms + whose system APIs accept UTF-8 encoded strings. Unicode + characters may now be used in CMake code, paths to source + files, configured files such as ".h.in" files, and other + files read and written by CMake. Note that because CMake + interoperates with many other tools, there may still be some + limitations when using certain unicode characters. + * Commands: + * The "add_custom_command()" and "add_custom_target()" + commands learned a new "BYPRODUCTS" option to specify files + produced as side effects of the custom commands. + These are not outputs because they do not always have to be + newer than inputs. + * The "add_custom_command()" and "add_custom_target()" + commands learned a new "USES_TERMINAL" option to request + that the command be given direct access to the terminal + if possible. The "Ninja" generator will places such commands + in the "console" "pool". Build targets provided by CMake + that are meant for individual interactive use, such as + "install", are now placed in this pool. + * A new "continue()" command was added that can be called + inside loop contexts to end the current iteration and start + the next one at the top of the loop block. + * The "file(LOCK)" subcommand was created to allow CMake + processes to synchronize through file and directory locks. + * The "file(STRINGS)" now supports UTF-16LE, UTF-16BE, UTF-32LE, + UTF- 32BE as "ENCODING" options. + * The "install(EXPORT)" command now works with an absolute + "DESTINATION" even if targets in the export set are + installed with a destination or *usage requirements* + specified relative to the install prefix. The value of the + "CMAKE_INSTALL_PREFIX" variable is hard-coded into the + installed export file as the base for relative references. + * The "try_compile()" command source file signature now honors + link flags (e.g. "CMAKE_EXE_LINKER_FLAGS") in the generated + test project. See policy "CMP0056". + * The "try_run()" command learned to honor the "LINK_LIBRARIES" + option just as "try_compile()" already does. + * The "file(GENERATE)" command now generates the output file + with the same permissions as the input file if set. + * The "file(GENERATE)" command can now generate files which + are used as source files for buildsystem targets. Generated + files automatically get their "GENERATED" property + set to "TRUE". + * Variables: + * The "CMAKE_MATCH_COUNT" variable was introduced to record + the number of matches made in the last regular expression + matched in an "if()" command or a "string()" command. + * Properties: + * An "ANDROID_API_MIN" target property was introduced to + specify the minimum version to be targeted by the toolchain. + * A "VS_SHADER_FLAGS" source file property was added to + specify additional shader flags to ".hlsl" files, for the + Visual Studio generators. + * Modules: + * The "ExternalData" module learned to support *Custom Fetch + Scripts*. This allows projects to specify custom ".cmake" + scripts for fetching data objects during the build. + * The "ExternalProject" module learned options to create + independent external project step targets that do not depend + on the builtin steps. + * The "ExternalProject" module "ExternalProject_Add()" command + learned a new "CMAKE_CACHE_DEFAULT_ARGS" option to initialize + cache values in the external project without setting them on + future builds. + * The "ExternalProject" module "ExternalProject_Add()" command + learned a new "TEST_EXCLUDE_FROM_MAIN" option to exclude tests + from the main build. + * The "ExternalProject" module "ExternalProject_Add()" command + learned a new "UPDATE_DISCONNECTED" option to avoid + automatically updating the source tree checkout from + version control. + * The "FindCUDA" module learned about the "cusolver" library + in CUDA 7.0. + * The "FindGit" module learned to find the "git" command-line + tool that comes with GitHub for Windows installed in user + home directories. + * A "FindGSL" module was introduced to find the GNU Scientific + Library. + * A "FindIntl" module was introduced to find the Gettext + "libintl" library. + * A "FindJsonCpp" module was introduced to find the JsonCpp + package. + * The "FindLATEX" module learned to support components. + * The "FindMPI" module learned to find MS-MPI on Windows. + * The "FindOpenSSL" module now reports "crypto" and "ssl" + libraries separately in "OPENSSL_CRYPTO_LIBRARY" and + "OPENSSL_SSL_LIBRARY", respectively, to allow applications + to link to one without the other. + * The "WriteCompilerDetectionHeader" module learned to create + a define for portability of the "cxx_thread_local" feature. + The define expands to either the C++11 "thread_local" keyword, + or a pre-standardization compiler-specific equivalent, + as appropriate. + * The "WriteCompilerDetectionHeader" module learned to create + multiple output files per compiler and per language, instead + of creating one large file. + * CTest: + * The "ctest_coverage()" command learned to support Delphi + coverage. + * The "ctest_coverage()" command learned to support Javascript + coverage. + * The "CTestCoverageCollectGCOV" module was introduced as an + alternative to the "ctest_coverage()" command for collecting + "gcov" results for submission to CDash. + * CPack: + * The "CPackRPM" module learned options to set per-component + descriptions and summaries. See the + "CPACK_RPM__PACKAGE_DESCRIPTION" and + "CPACK_RPM__PACKAGE_SUMMARY" variables. + * The "CPackRPM" module learned options to specify requirements + for pre- and post-install scripts. + See the "CPACK_RPM_PACKAGE_REQUIRES_PRE" and + "CPACK_RPM_PACKAGE_REQUIRES_POST" variables. + * The "CPackRPM" module learned options to specify requirements + for pre- and post-uninstall scripts. + See the "CPACK_RPM_PACKAGE_REQUIRES_PREUN" and + "CPACK_RPM_PACKAGE_REQUIRES_POSTUN" variables. + * The "CPackRPM" module learned a new + "CPACK_RPM__PACKAGE_PREFIX" variable to specify a + component-specific value to use instead of + "CPACK_PACKAGING_INSTALL_PREFIX". + * The "CPackRPM" module learned a new + "CPACK_RPM_RELOCATION_PATHS" variable to specify multiple + relocation prefixes for a single rpm package. + * Other: + * The "cmake(1)" "-E tar" command now supports creating + ".xz"-compressed archives with the "J" flag. + * The "cmake(1)" "-E tar" command learned a new + "--files-from=" option to specify file names using + lines in a file to overcome command-line length limits. + * The "cmake(1)" "-E tar" command learned a new "--mtime=" + option to specify the modification time recorded in + tarball entries. + * The "Compile Features" functionality is now aware of features + supported by more compilers, including: + * Apple Clang ("AppleClang") for Xcode versions 4.4 though 6.1. + * GNU compiler versions 4.4 through 5.0 on UNIX and Apple ("GNU"). + * Microsoft Visual Studio ("MSVC") for versions 2010 through 2015. + * Oracle SolarisStudio ("SunPro") version 12.4. + * The *AUTORCC* feature now tracks files listed in ".qrc" files + as dependencies. If an input file to the "rcc" tool is changed, + the tool is automatically re-run. + * New Diagnostics: + * The "break()" command now rejects calls outside of a loop + context or that pass arguments to the command. + See policy "CMP0055". + * Deprecated and Removed Features: + * Files written in the "cmake-language(7)", such as + "CMakeLists.txt" or "*.cmake" files, are now expected to be + encoded as UTF-8. If files are already ASCII, they will be + compatible. If files were in a different encoding, + including Latin 1, they will need to be converted. + * The "FindOpenGL" module no longer explicitly searches for any + dependency on X11 libraries with the "FindX11" module. Such + dependencies should not need to be explicit. Applications + using X11 APIs themselves should find and link to X11 + libraries explicitly. + * The implementation of CMake now relies on some C++ compiler + features which are not supported by some older compilers. + As a result, those old compilers can no longer be used to + build CMake itself. CMake continues to be able to generate + Makefiles and project files for users of those old compilers + however. Compilers known to no longer be capable of building + CMake are: + * Visual Studio 6 and 7.0 -- superseded by VisualStudio 7.1 + and newer. + * GCC 2.95 -- superseded by GCC 3 and newer compilers. + * Borland compilers -- superseded by other Windows compilers. + * Compaq compilers -- superseded by other compilers. + * SGI compilers -- IRIX was dropped as a host platform. + * Other Changes: + * On Windows and OS X, commands supporting network communication + via "https", such as "file(DOWNLOAD)", "file(UPLOAD)", and + "ctest_submit()", now support SSL/TLS even when CMake is not + built against OpenSSL. The Windows or OS X native SSL/TLS + implementation is used by default. OS-configured certificate + authorities will be trusted automatically. + On other platforms, when CMake is built with OpenSSL, + these commands now search for OS-configured certificate + authorities in a few "/etc" paths to be trusted automatically. + * On OS X with Makefile and Ninja generators, when a compiler + is found in "/usr/bin" it is now mapped to the corresponding + compiler inside the Xcode application folder, if any. This + allows such build trees to continue to work with their + original compiler even when "xcode- select" switches to a + different Xcode installation. + * The Visual Studio generators now write solution and project + files in UTF-8 instead of Windows-1252. Windows-1252 + supported Latin 1 languages such as those found in North + and South America and Western Europe. With UTF-8, additional + languages are now supported. + * The "Xcode" generator no longer requires a value for the + "CMAKE_MAKE_PROGRAM" variable to be located up front. It now + locates "xcodebuild" when needed at build time. + * When building CMake itself using SolarisStudio 12, the + default "libCStd" standard library is not sufficient to + build CMake. The SolarisStudio distribution supports compiler + options to use "STLPort4" or "libstdc++". An appropriate + option to select the standard library is now added + automatically when building CMake with SolarisStudio compilers. +- BuildRequire pkgconfig(jsoncpp), and use it as system library on + openSUSE > 13.2 +- Added form.patch: set the correct include path for the + ncurses includes +- Added system-libs.patch: allow choosing between bundled and + system jsoncpp & form libs + ------------------------------------------------------------------- Fri Feb 13 06:56:18 UTC 2015 - foss@grueninger.de diff --git a/cmake-gui.spec b/cmake-gui.spec index 8175ee6..65d3afb 100644 --- a/cmake-gui.spec +++ b/cmake-gui.spec @@ -1,7 +1,7 @@ # # spec file for package cmake-gui # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,18 @@ Name: cmake-gui -Version: 3.1.3 +Version: 3.2.0~rc1 Release: 0 -%define rversion %{version} +%define rversion 3.2.0-rc1 Summary: CMake graphical user interface License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.1/cmake-%{rversion}.tar.gz +Source0: http://www.cmake.org/files/v3.2/cmake-%{rversion}.tar.gz +# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes +Patch4: form.patch +# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs +Patch5: system-libs.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -34,6 +38,9 @@ BuildRequires: openssl-devel BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: zlib-devel +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(jsoncpp) +%endif BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) Requires: cmake @@ -58,6 +65,8 @@ Manual pages for cmake, Cross-platform, open-source make system %prep %setup -q -n cmake-%{rversion} +%patch4 -p1 +%patch5 -p1 %build EXTRA_FLAGS="--qt-gui" @@ -77,6 +86,9 @@ export CFLAGS="$CXXFLAGS" --system-zlib \ --system-bzip2 \ --no-system-libarchive \ +%endif +%if 0%{?suse_version} <= 1320 + --no-system-jsoncpp \ %endif --parallel=0%{jobs} \ --qt-gui @@ -97,7 +109,11 @@ rm -rf %{buildroot}%{_docdir}/cmake %{_bindir}/cmake-gui %{_datadir}/applications/CMake.desktop %{_datadir}/mime/packages/cmakecache.xml -%{_datadir}/pixmaps/CMakeSetup32.png +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/* +%dir %{_datadir}/icons/hicolor/*/* +%{_datadir}/icons/hicolor/128x128/apps/CMakeSetup.png +%{_datadir}/icons/hicolor/32x32/apps/CMakeSetup.png %files -n cmake-man %defattr(-,root,root) diff --git a/cmake.changes b/cmake.changes index 0d85b42..1eff308 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,218 @@ +------------------------------------------------------------------- +Sat Feb 14 19:48:11 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 3.2 rc1: + * New Features: + * Syntax: + * CMake learned to support unicode characters *encoded as + UTF-8* on Windows. This was already supported on platforms + whose system APIs accept UTF-8 encoded strings. Unicode + characters may now be used in CMake code, paths to source + files, configured files such as ".h.in" files, and other + files read and written by CMake. Note that because CMake + interoperates with many other tools, there may still be some + limitations when using certain unicode characters. + * Commands: + * The "add_custom_command()" and "add_custom_target()" + commands learned a new "BYPRODUCTS" option to specify files + produced as side effects of the custom commands. + These are not outputs because they do not always have to be + newer than inputs. + * The "add_custom_command()" and "add_custom_target()" + commands learned a new "USES_TERMINAL" option to request + that the command be given direct access to the terminal + if possible. The "Ninja" generator will places such commands + in the "console" "pool". Build targets provided by CMake + that are meant for individual interactive use, such as + "install", are now placed in this pool. + * A new "continue()" command was added that can be called + inside loop contexts to end the current iteration and start + the next one at the top of the loop block. + * The "file(LOCK)" subcommand was created to allow CMake + processes to synchronize through file and directory locks. + * The "file(STRINGS)" now supports UTF-16LE, UTF-16BE, UTF-32LE, + UTF- 32BE as "ENCODING" options. + * The "install(EXPORT)" command now works with an absolute + "DESTINATION" even if targets in the export set are + installed with a destination or *usage requirements* + specified relative to the install prefix. The value of the + "CMAKE_INSTALL_PREFIX" variable is hard-coded into the + installed export file as the base for relative references. + * The "try_compile()" command source file signature now honors + link flags (e.g. "CMAKE_EXE_LINKER_FLAGS") in the generated + test project. See policy "CMP0056". + * The "try_run()" command learned to honor the "LINK_LIBRARIES" + option just as "try_compile()" already does. + * The "file(GENERATE)" command now generates the output file + with the same permissions as the input file if set. + * The "file(GENERATE)" command can now generate files which + are used as source files for buildsystem targets. Generated + files automatically get their "GENERATED" property + set to "TRUE". + * Variables: + * The "CMAKE_MATCH_COUNT" variable was introduced to record + the number of matches made in the last regular expression + matched in an "if()" command or a "string()" command. + * Properties: + * An "ANDROID_API_MIN" target property was introduced to + specify the minimum version to be targeted by the toolchain. + * A "VS_SHADER_FLAGS" source file property was added to + specify additional shader flags to ".hlsl" files, for the + Visual Studio generators. + * Modules: + * The "ExternalData" module learned to support *Custom Fetch + Scripts*. This allows projects to specify custom ".cmake" + scripts for fetching data objects during the build. + * The "ExternalProject" module learned options to create + independent external project step targets that do not depend + on the builtin steps. + * The "ExternalProject" module "ExternalProject_Add()" command + learned a new "CMAKE_CACHE_DEFAULT_ARGS" option to initialize + cache values in the external project without setting them on + future builds. + * The "ExternalProject" module "ExternalProject_Add()" command + learned a new "TEST_EXCLUDE_FROM_MAIN" option to exclude tests + from the main build. + * The "ExternalProject" module "ExternalProject_Add()" command + learned a new "UPDATE_DISCONNECTED" option to avoid + automatically updating the source tree checkout from + version control. + * The "FindCUDA" module learned about the "cusolver" library + in CUDA 7.0. + * The "FindGit" module learned to find the "git" command-line + tool that comes with GitHub for Windows installed in user + home directories. + * A "FindGSL" module was introduced to find the GNU Scientific + Library. + * A "FindIntl" module was introduced to find the Gettext + "libintl" library. + * A "FindJsonCpp" module was introduced to find the JsonCpp + package. + * The "FindLATEX" module learned to support components. + * The "FindMPI" module learned to find MS-MPI on Windows. + * The "FindOpenSSL" module now reports "crypto" and "ssl" + libraries separately in "OPENSSL_CRYPTO_LIBRARY" and + "OPENSSL_SSL_LIBRARY", respectively, to allow applications + to link to one without the other. + * The "WriteCompilerDetectionHeader" module learned to create + a define for portability of the "cxx_thread_local" feature. + The define expands to either the C++11 "thread_local" keyword, + or a pre-standardization compiler-specific equivalent, + as appropriate. + * The "WriteCompilerDetectionHeader" module learned to create + multiple output files per compiler and per language, instead + of creating one large file. + * CTest: + * The "ctest_coverage()" command learned to support Delphi + coverage. + * The "ctest_coverage()" command learned to support Javascript + coverage. + * The "CTestCoverageCollectGCOV" module was introduced as an + alternative to the "ctest_coverage()" command for collecting + "gcov" results for submission to CDash. + * CPack: + * The "CPackRPM" module learned options to set per-component + descriptions and summaries. See the + "CPACK_RPM__PACKAGE_DESCRIPTION" and + "CPACK_RPM__PACKAGE_SUMMARY" variables. + * The "CPackRPM" module learned options to specify requirements + for pre- and post-install scripts. + See the "CPACK_RPM_PACKAGE_REQUIRES_PRE" and + "CPACK_RPM_PACKAGE_REQUIRES_POST" variables. + * The "CPackRPM" module learned options to specify requirements + for pre- and post-uninstall scripts. + See the "CPACK_RPM_PACKAGE_REQUIRES_PREUN" and + "CPACK_RPM_PACKAGE_REQUIRES_POSTUN" variables. + * The "CPackRPM" module learned a new + "CPACK_RPM__PACKAGE_PREFIX" variable to specify a + component-specific value to use instead of + "CPACK_PACKAGING_INSTALL_PREFIX". + * The "CPackRPM" module learned a new + "CPACK_RPM_RELOCATION_PATHS" variable to specify multiple + relocation prefixes for a single rpm package. + * Other: + * The "cmake(1)" "-E tar" command now supports creating + ".xz"-compressed archives with the "J" flag. + * The "cmake(1)" "-E tar" command learned a new + "--files-from=" option to specify file names using + lines in a file to overcome command-line length limits. + * The "cmake(1)" "-E tar" command learned a new "--mtime=" + option to specify the modification time recorded in + tarball entries. + * The "Compile Features" functionality is now aware of features + supported by more compilers, including: + * Apple Clang ("AppleClang") for Xcode versions 4.4 though 6.1. + * GNU compiler versions 4.4 through 5.0 on UNIX and Apple ("GNU"). + * Microsoft Visual Studio ("MSVC") for versions 2010 through 2015. + * Oracle SolarisStudio ("SunPro") version 12.4. + * The *AUTORCC* feature now tracks files listed in ".qrc" files + as dependencies. If an input file to the "rcc" tool is changed, + the tool is automatically re-run. + * New Diagnostics: + * The "break()" command now rejects calls outside of a loop + context or that pass arguments to the command. + See policy "CMP0055". + * Deprecated and Removed Features: + * Files written in the "cmake-language(7)", such as + "CMakeLists.txt" or "*.cmake" files, are now expected to be + encoded as UTF-8. If files are already ASCII, they will be + compatible. If files were in a different encoding, + including Latin 1, they will need to be converted. + * The "FindOpenGL" module no longer explicitly searches for any + dependency on X11 libraries with the "FindX11" module. Such + dependencies should not need to be explicit. Applications + using X11 APIs themselves should find and link to X11 + libraries explicitly. + * The implementation of CMake now relies on some C++ compiler + features which are not supported by some older compilers. + As a result, those old compilers can no longer be used to + build CMake itself. CMake continues to be able to generate + Makefiles and project files for users of those old compilers + however. Compilers known to no longer be capable of building + CMake are: + * Visual Studio 6 and 7.0 -- superseded by VisualStudio 7.1 + and newer. + * GCC 2.95 -- superseded by GCC 3 and newer compilers. + * Borland compilers -- superseded by other Windows compilers. + * Compaq compilers -- superseded by other compilers. + * SGI compilers -- IRIX was dropped as a host platform. + * Other Changes: + * On Windows and OS X, commands supporting network communication + via "https", such as "file(DOWNLOAD)", "file(UPLOAD)", and + "ctest_submit()", now support SSL/TLS even when CMake is not + built against OpenSSL. The Windows or OS X native SSL/TLS + implementation is used by default. OS-configured certificate + authorities will be trusted automatically. + On other platforms, when CMake is built with OpenSSL, + these commands now search for OS-configured certificate + authorities in a few "/etc" paths to be trusted automatically. + * On OS X with Makefile and Ninja generators, when a compiler + is found in "/usr/bin" it is now mapped to the corresponding + compiler inside the Xcode application folder, if any. This + allows such build trees to continue to work with their + original compiler even when "xcode- select" switches to a + different Xcode installation. + * The Visual Studio generators now write solution and project + files in UTF-8 instead of Windows-1252. Windows-1252 + supported Latin 1 languages such as those found in North + and South America and Western Europe. With UTF-8, additional + languages are now supported. + * The "Xcode" generator no longer requires a value for the + "CMAKE_MAKE_PROGRAM" variable to be located up front. It now + locates "xcodebuild" when needed at build time. + * When building CMake itself using SolarisStudio 12, the + default "libCStd" standard library is not sufficient to + build CMake. The SolarisStudio distribution supports compiler + options to use "STLPort4" or "libstdc++". An appropriate + option to select the standard library is now added + automatically when building CMake with SolarisStudio compilers. +- BuildRequire pkgconfig(jsoncpp), and use it as system library on + openSUSE > 13.2 +- Added form.patch: set the correct include path for the + ncurses includes +- Added system-libs.patch: allow choosing between bundled and + system jsoncpp & form libs + ------------------------------------------------------------------- Fri Feb 13 06:55:20 UTC 2015 - foss@grueninger.de diff --git a/cmake.spec b/cmake.spec index 4b82c04..ae416f4 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # # spec file for package cmake # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,25 +17,32 @@ Name: cmake -Version: 3.1.3 +Version: 3.2.0~rc1 Release: 0 -%define rversion %{version} +%define rversion 3.2.0-rc1 Summary: Cross-platform, open-source make system License: BSD-3-Clause Group: Development/Tools/Building Url: http://www.cmake.org/ -Source0: http://www.cmake.org/files/v3.1/%{name}-%{rversion}.tar.gz +Source0: http://www.cmake.org/files/v3.2/%{name}-%{rversion}.tar.gz Source1: cmake.macros Source2: opensuse_rules.cmake Patch2: cmake-fix-ruby-test.patch # PATCH-FIX-OPENSUSE: bnc#874885 contain the python swig namespace Patch3: cmake-prefix-swig.patch +# PATCH-FIX-UPSTREAM form.patch -- set the correct include path for the ncurses includes +Patch4: form.patch +# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and system jsoncpp & form libs +Patch5: system-libs.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: ncurses-devel BuildRequires: zlib-devel +%if 0%{?suse_version} > 1320 +BuildRequires: pkgconfig(jsoncpp) +%endif BuildRequires: pkgconfig(liblzma) Requires: make Recommends: cmake-mans @@ -52,6 +59,8 @@ CMake is a cross-platform, open-source build system %setup -q -n %{name}-%{rversion} %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build export CXXFLAGS="%{optflags}" @@ -64,6 +73,9 @@ export CFLAGS="$CXXFLAGS" --system-libs \ %if 0%{?suse_version} <= 1110 --no-system-libarchive \ +%endif +%if 0%{?suse_version} <= 1320 + --no-system-jsoncpp \ %endif --parallel=0%{jobs} \ --verbose \ diff --git a/form.patch b/form.patch new file mode 100644 index 0000000..7527a29 --- /dev/null +++ b/form.patch @@ -0,0 +1,13 @@ +diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt +index 7d4e88c..0cc5357 100644 +--- a/Source/CursesDialog/CMakeLists.txt ++++ b/Source/CursesDialog/CMakeLists.txt +@@ -30,7 +30,7 @@ if( NOT CMAKE_USE_SYSTEM_FORM ) + include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form + ${CMake_BINARY_DIR}/Source/CursesDialog/form) + endif() +-include_directories(${CURSES_INCLUDE_PATH}) ++include_directories(${CURSES_INCLUDE_PATH}/ncurses/) + + + add_executable(ccmake ${CURSES_SRCS} ) diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..e47c929 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,15 @@ +--- cmake-3.2.0-rc1/bootstrap.old 2015-02-13 15:25:48.000000000 +0100 ++++ cmake-3.2.0-rc1/bootstrap 2015-02-14 03:52:26.509047998 +0100 +@@ -637,10 +637,10 @@ while test $# != 0; do + --init=*) cmake_init_file=`cmake_arg "$1"` ;; + --system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=1" ;; + --no-system-libs) cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARIES=0" ;; +- --system-bzip2|--system-curl|--system-expat|--system-libarchive|--system-zlib) ++ --system-bzip2|--system-curl|--system-expat|--system-form|--system-jsoncpp|--system-libarchive|--system-zlib) + lib=`cmake_arg "$1" "--system-"` + cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=1" ;; +- --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-libarchive|--no-system-zlib) ++ --no-system-bzip2|--no-system-curl|--no-system-expat|--no-system-form|--no-system-jsoncpp|--no-system-libarchive|--no-system-zlib) + lib=`cmake_arg "$1" "--no-system-"` + cmake_bootstrap_system_libs="${cmake_bootstrap_system_libs} -DCMAKE_USE_SYSTEM_LIBRARY_`cmake_toupper $lib`=0" ;; + --qt-gui) cmake_bootstrap_qt_gui="1" ;;