Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2015-03-18 14:35:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes 2015-02-16 17:23:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes 2015-03-18 14:35:59.000000000 +0100 @@ -1,0 +2,244 @@ +Sun Mar 15 12:02:10 UTC 2015 - [email protected] + +- Update to 3.2.1 + * Changes since 3.2.0~rc1 + Makefile: Fix multiple custom command outputs regression (#15116) + configure_file: Do not warn about newline style arguments + Tests: Add more signature tests to RunCMake.configure_file test + Ninja: Improve internal check for generating at the top-level (#15436) + UseSWIG: Avoid if() auto-dereferene in quoted arguments + Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426) + CPackRPM: Fix handling of relocation prefix parent directories + KWSys SystemTools: Update CopyFileAlways stream library workarounds + install: Write the entire installation manifest at once + Help: Revise configure_file documentation (#15403) + Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section + Utilities/Release: Build OS X and Win binaries without OpenSSL + cmake-gui: Reset generator platform and toolset on configure (#15411) + FindJsonCpp: Drop new module due to upstream jsoncpp providing package + bootstrap: Add --(no-)system-jsoncpp options + FindCurses: Drop unused check for cbreak in tinfo library + FindJNI: Add arch-specific library dir for JDK 9 layout (#15408) +- Update system-libs.patch + +------------------------------------------------------------------- +Thu Feb 19 15:05:10 UTC 2015 - [email protected] + +- Comment jsoncpp BuildRequires, as it creates dependancy cycle + +------------------------------------------------------------------- +Sat Feb 14 19:48:11 UTC 2015 - [email protected] + +- 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_<component>_PACKAGE_DESCRIPTION" and + "CPACK_RPM_<component>_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_<COMPONENT>_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=<file>" 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=<date>" + 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 ++++ 47 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cmake/cmake-gui.changes ++++ and /work/SRC/openSUSE:Factory/.cmake.new/cmake-gui.changes --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2015-02-16 17:23:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2015-03-18 14:35:59.000000000 +0100 @@ -1,0 +2,271 @@ +Sun Mar 15 11:59:13 UTC 2015 - [email protected] + +- Update to 3.2.1 + * Changes since 3.2.0~rc1 + Makefile: Fix multiple custom command outputs regression (#15116) + configure_file: Do not warn about newline style arguments + Tests: Add more signature tests to RunCMake.configure_file test + Ninja: Improve internal check for generating at the top-level (#15436) + UseSWIG: Avoid if() auto-dereferene in quoted arguments + Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426) + CPackRPM: Fix handling of relocation prefix parent directories + KWSys SystemTools: Update CopyFileAlways stream library workarounds + install: Write the entire installation manifest at once + Help: Revise configure_file documentation (#15403) + Help: In 3.2 relnotes move OpenGL/X11 to deprecated/removed section + Utilities/Release: Build OS X and Win binaries without OpenSSL + cmake-gui: Reset generator platform and toolset on configure (#15411) + FindJsonCpp: Drop new module due to upstream jsoncpp providing package + bootstrap: Add --(no-)system-jsoncpp options + FindCurses: Drop unused check for cbreak in tinfo library + FindJNI: Add arch-specific library dir for JDK 9 layout (#15408) +- Update system-libs.patch + +------------------------------------------------------------------- +Wed Mar 11 10:16:22 UTC 2015 - [email protected] + +- Do not specify the compiler cc and c++ at all, it should be the + default value and cmake expects full path in some cases. + This should fix the failing build with error c++ not found in PATH + +------------------------------------------------------------------- +Fri Mar 6 12:47:35 UTC 2015 - [email protected] + +- Remove full path from compiler to allow ccache override + via path +- This might break build if your package breaks $PATH content +- Tested on KDE and it build and some misc apps too. + If something fails it should be fixed per app basis + +------------------------------------------------------------------- +Mon Feb 23 09:21:55 UTC 2015 - [email protected] + +- cmake-fix-pie-binaries.patch: fix the PIE binaries check for + newer file versions + +------------------------------------------------------------------- +Thu Feb 19 15:05:10 UTC 2015 - [email protected] + +- Comment jsoncpp BuildRequires, as it creates dependancy cycle + +------------------------------------------------------------------- +Mon Feb 16 14:59:01 UTC 2015 - [email protected] + +- Remove cmake-prefix-swig.patch as it caused unexpected regressions + +------------------------------------------------------------------- +Sat Feb 14 19:48:11 UTC 2015 - [email protected] + +- 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_<component>_PACKAGE_DESCRIPTION" and + "CPACK_RPM_<component>_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_<COMPONENT>_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=<file>" 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=<date>" + option to specify the modification time recorded in + tarball entries. + * The "Compile Features" functionality is now aware of features ++++ 74 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/cmake/cmake.changes ++++ and /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes Old: ---- cmake-3.1.3.tar.gz cmake-prefix-swig.patch New: ---- cmake-3.2.1.tar.gz cmake-fix-pie-binaries.patch form.patch system-libs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake-gui.spec ++++++ --- /var/tmp/diff_new_pack.8ykjZZ/_old 2015-03-18 14:36:01.000000000 +0100 +++ /var/tmp/diff_new_pack.8ykjZZ/_new 2015-03-18 14:36:01.000000000 +0100 @@ -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,17 @@ Name: cmake-gui -Version: 3.1.3 +Version: 3.2.1 Release: 0 -%define rversion %{version} 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-%{version}.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 +37,10 @@ BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: zlib-devel +# this is commented as it would create dependancy cycle between jsoncpp and cmake +#if 0%{?suse_version} > 1320 +#BuildRequires: pkgconfig(jsoncpp) +#endif BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(liblzma) Requires: cmake @@ -57,7 +64,9 @@ Manual pages for cmake, Cross-platform, open-source make system %prep -%setup -q -n cmake-%{rversion} +%setup -q -n cmake-%{version} +%patch4 -p1 +%patch5 -p1 %build EXTRA_FLAGS="--qt-gui" @@ -78,6 +87,7 @@ --system-bzip2 \ --no-system-libarchive \ %endif + --no-system-jsoncpp \ --parallel=0%{jobs} \ --qt-gui make VERBOSE=1 %{?_smp_mflags} @@ -97,7 +107,11 @@ %{_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) ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.8ykjZZ/_old 2015-03-18 14:36:01.000000000 +0100 +++ /var/tmp/diff_new_pack.8ykjZZ/_new 2015-03-18 14:36:01.000000000 +0100 @@ -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,33 @@ Name: cmake -Version: 3.1.3 +Version: 3.2.1 Release: 0 -%define rversion %{version} 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}-%{version}.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 +# PATCH-FIX-UPSTREAM cmake-fix-pie-binaries.patch -- new "file" is reporting PIE binaries a bit differently +# I sent this by email to cmake-developers. +Patch6: cmake-fix-pie-binaries.patch BuildRequires: curl-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libexpat-devel BuildRequires: ncurses-devel BuildRequires: zlib-devel +# this is commented as it would create dependancy cycle between jsoncpp and cmake +#if 0%{?suse_version} > 1320 +#BuildRequires: pkgconfig(jsoncpp) +#endif BuildRequires: pkgconfig(liblzma) Requires: make Recommends: cmake-mans @@ -49,13 +57,15 @@ CMake is a cross-platform, open-source build system %prep -%setup -q -n %{name}-%{rversion} +%setup -q -n %{name}-%{version} %patch2 -p1 -%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build export CXXFLAGS="%{optflags}" -export CFLAGS="$CXXFLAGS" +export CFLAGS="%{optflags}" ./configure \ --prefix=%{_prefix} \ --datadir=/share/%{name} \ @@ -65,6 +75,7 @@ %if 0%{?suse_version} <= 1110 --no-system-libarchive \ %endif + --no-system-jsoncpp \ --parallel=0%{jobs} \ --verbose \ --no-qt-gui ++++++ cmake-3.1.3.tar.gz -> cmake-3.2.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/cmake/cmake-3.1.3.tar.gz /work/SRC/openSUSE:Factory/.cmake.new/cmake-3.2.1.tar.gz differ: char 5, line 1 ++++++ cmake-fix-pie-binaries.patch ++++++ Index: cmake-3.2.0-rc1/Modules/GetPrerequisites.cmake =================================================================== --- cmake-3.2.0-rc1.orig/Modules/GetPrerequisites.cmake +++ cmake-3.2.0-rc1/Modules/GetPrerequisites.cmake @@ -260,6 +260,13 @@ function(is_file_executable file result_ return() endif() + # newer file version does not use (used shared libraries) + # but uses interpreter + if("${file_ov}" MATCHES "shared object.*interpreter") + set(${result_var} 1 PARENT_SCOPE) + return() + endif() + else() message(STATUS "warning: No 'file' command, skipping execute_process...") endif() ++++++ form.patch ++++++ 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} ) ++++++ opensuse_rules.cmake ++++++ --- /var/tmp/diff_new_pack.8ykjZZ/_old 2015-03-18 14:36:01.000000000 +0100 +++ /var/tmp/diff_new_pack.8ykjZZ/_new 2015-03-18 14:36:01.000000000 +0100 @@ -1,8 +1,6 @@ SET (CMAKE_AR /usr/bin/ar CACHE FILEPATH "Archive manager" FORCE) SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> OPTFLAGS <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) -SET (CMAKE_C_COMPILER /usr/bin/gcc CACHE FILEPATH "C compiler" FORCE) SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) -SET (CMAKE_CXX_COMPILER /usr/bin/c++ CACHE FILEPATH "C++ compiler" FORCE) SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) SET (CMAKE_RANLIB /usr/bin/ranlib CACHE FILEPATH "Archive index generator" FORCE) SET (PKG_CONFIG_EXECUTABLE /usr/bin/pkg-config CACHE FILEPATH "pkg-config executable" FORCE) ++++++ system-libs.patch ++++++ --- cmake-3.2.1/bootstrap 2015-03-10 15:38:46.000000000 +0100 +++ cmake-3.2.1/bootstrap.old 2015-03-15 11:57:31.067275055 +0100 @@ -639,10 +639,10 @@ --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-jsoncpp|--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-jsoncpp|--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" ;; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
