From d9dd44f586f5978e7e9768a428d322e9c8041c67 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 17 Feb 2016 09:59:14 -0700 Subject: [PATCH] Update to 3.5.0-rc2 - Drop dcmtk patch --- .gitignore | 1 + cmake-dcmtk.patch | 89 ----------------------------------------------- cmake.spec | 19 +++++----- sources | 2 +- 4 files changed, 12 insertions(+), 99 deletions(-) delete mode 100644 cmake-dcmtk.patch diff --git a/.gitignore b/.gitignore index 59ba4d1..9820edc 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /cmake-3.4.1.tar.gz /cmake-3.4.2.tar.gz /cmake-3.4.3.tar.gz +/cmake-3.5.0-rc2.tar.gz diff --git a/cmake-dcmtk.patch b/cmake-dcmtk.patch deleted file mode 100644 index e00b493..0000000 --- a/cmake-dcmtk.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- cmake-3.0.0-rc1/Modules/FindDCMTK.cmake.orig 2014-02-26 08:41:21.000000000 -0700 -+++ cmake-3.0.0-rc1/Modules/FindDCMTK.cmake 2014-04-04 09:14:46.290915700 -0600 -@@ -33,6 +33,10 @@ - # Written for VXL by Amitha Perera. - # Upgraded for GDCM by Mathieu Malaterre. - # Modified for EasyViz by Thomas Sondergaard. -+# -+# Wed Jul 27 2011 Ankur Sinha -+# - Add all dcmtk libs -+# - Add usr/lib to paths - # - - if(NOT DCMTK_FOUND AND NOT DCMTK_DIR) -@@ -47,20 +51,26 @@ - - foreach(lib - dcmdata -+ dcmdsig - dcmimage - dcmimgle - dcmjpeg -+ dcmjpls - dcmnet - dcmpstat - dcmqrdb -- dcmsign - dcmsr - dcmtls -+ dcmwlm - ijg12 - ijg16 - ijg8 -+ libi2d -+ oflog - ofstd) - -+ -+ - find_library(DCMTK_${lib}_LIBRARY - ${lib} - PATHS -@@ -69,7 +79,8 @@ - ${DCMTK_DIR}/${lib}/libsrc/Debug - ${DCMTK_DIR}/${lib}/Release - ${DCMTK_DIR}/${lib}/Debug -- ${DCMTK_DIR}/lib) -+ ${DCMTK_DIR}/lib -+ /usr/lib/dcmtk) - - mark_as_advanced(DCMTK_${lib}_LIBRARY) - -@@ -85,13 +96,16 @@ - set(DCMTK_dcmimage_TEST_HEADER dicoimg.h) - set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h) - set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h) -+set(DCMTK_dcmjpls_TEST_HEADER djcodecd.h) - set(DCMTK_dcmnet_TEST_HEADER assoc.h) - set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h) - set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h) - set(DCMTK_dcmsign_TEST_HEADER sicert.h) - set(DCMTK_dcmsr_TEST_HEADER dsrtree.h) - set(DCMTK_dcmtls_TEST_HEADER tlslayer.h) -+set(DCMTK_dcmwlm_TEST_HEADER wldsfs.h) - set(DCMTK_ofstd_TEST_HEADER ofstdinc.h) -+set(DCMTK_oflog_TEST_HEADER oflog.h) - - foreach(dir - config -@@ -99,16 +113,20 @@ - dcmimage - dcmimgle - dcmjpeg -+ dcmjpls - dcmnet - dcmpstat - dcmqrdb - dcmsign - dcmsr - dcmtls -+ dcmwlen -+ oflog - ofstd) - find_path(DCMTK_${dir}_INCLUDE_DIR - ${DCMTK_${dir}_TEST_HEADER} - PATHS -+ /usr/include/dcmtk - ${DCMTK_DIR}/${dir}/include - ${DCMTK_DIR}/${dir} - ${DCMTK_DIR}/include/${dir} diff --git a/cmake.spec b/cmake.spec index dc9b725..c6eb749 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,11 +4,11 @@ # Set to bcond_with or use --without gui to disable qt4 gui build %bcond_without gui # Set to RC version if building RC, else %{nil} -%define rcver %{nil} +%global rcver -rc2 -%define rpm_macros_dir %{_sysconfdir}/rpm +%global rpm_macros_dir %{_sysconfdir}/rpm %if 0%{?fedora} || 0%{?rhel} >= 7 -%define rpm_macros_dir %{_rpmconfigdir}/macros.d +%global rpm_macros_dir %{_rpmconfigdir}/macros.d %endif %if 0%{?fedora} < 23 @@ -18,8 +18,8 @@ %endif Name: cmake -Version: 3.4.3 -Release: 3%{?dist} +Version: 3.5.0 +Release: 0.1.rc2%{?dist} Summary: Cross-platform make system Group: Development/Tools @@ -29,14 +29,12 @@ Group: Development/Tools # some GPL-licensed bison-generated files, these all include an exception granting redistribution under terms of your choice License: BSD and MIT and zlib URL: http://www.cmake.org -Source0: http://www.cmake.org/files/v3.4/cmake-%{version}%{?rcver}.tar.gz +Source0: http://www.cmake.org/files/v3.5/cmake-%{version}%{?rcver}.tar.gz Source1: cmake-init.el Source2: macros.cmake # See https://bugzilla.redhat.com/show_bug.cgi?id=1202899 Source3: cmake.attr Source4: cmake.prov -# Patch to find DCMTK in Fedora (bug #720140) -Patch0: cmake-dcmtk.patch # Patch to fix RindRuby vendor settings # http://public.kitware.com/Bug/view.php?id=12965 # https://bugzilla.redhat.com/show_bug.cgi?id=822796 @@ -113,7 +111,6 @@ The %{name}-gui package contains the Qt based GUI for CMake. %prep %setup -q -n %{name}-%{version}%{?rcver} # We cannot use backups with patches to Modules as they end up being installed -%patch0 -p1 %patch2 -p1 %if %{with python3} @@ -295,6 +292,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Wed Feb 17 2016 Orion Poplawski - 3.5.0-0.1.rc2 +- Update to 3.5.0-rc2 +- Drop dcmtk patch + * Sun Feb 7 2016 Orion Poplawski - 3.4.3-3 - Fix build without gui (bug #1305310) diff --git a/sources b/sources index 039829d..d6ebb06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4cb3ff35b2472aae70f542116d616e63 cmake-3.4.3.tar.gz +db47cde68afb25b2d5b0192d92b46a67 cmake-3.5.0-rc2.tar.gz