From 4a51bebd283031bc6e67ca05c613dce68fc7e319 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Aug 23 2015 02:47:31 +0000 Subject: Note bundled kwsys, remove unused kwsys files --- diff --git a/paraview.spec b/paraview.spec index 02601ab..7b1168a 100644 --- a/paraview.spec +++ b/paraview.spec @@ -22,7 +22,7 @@ Name: paraview Version: %{pv_majmin}.%{pv_patch} -Release: 12%{?dist} +Release: 13%{?dist} Summary: Parallel visualization application Group: Applications/Engineering @@ -103,6 +103,24 @@ Provides: paraview-demos = %{version}-%{release} Obsoletes: paraview-doc < %{version}-%{release} Provides: paraview-doc = %{version}-%{release} +# Bundled KWSys +# https://fedorahosted.org/fpc/ticket/555 +# Components used are specified in VTK/Utilities/KWSys/CMakeLists.txt +Provides: bundled(kwsys-base64) +Provides: bundled(kwsys-commandlinearguments) +Provides: bundled(kwsys-directory) +Provides: bundled(kwsys-dynamicloader) +Provides: bundled(kwsys-encoding) +Provides: bundled(kwsys-fstream) +Provides: bundled(kwsys-fundamentaltype) +Provides: bundled(kwsys-glob) +Provides: bundled(kwsys-md5) +Provides: bundled(kwsys-process) +Provides: bundled(kwsys-regularexpression) +Provides: bundled(kwsys-system) +Provides: bundled(kwsys-systeminformation) +Provides: bundled(kwsys-systemtools) + # Do not provide anything in paraview's library directory %global __provides_exclude_from ^(%{_libdir}/paraview/|%{_libdir}/.*/lib/paraview/).*$ # Do not require anything provided in paraview's library directory @@ -290,6 +308,8 @@ for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtkmp do rm -r VTK/ThirdParty/*/${x} done +# Remove unused KWSys items +find VTK/Utilities/KWSys/vtksys/ -name \*.[ch]\* | grep -vE '^VTK/Utilities/KWSys/vtksys/([a-z].*|Configure|SharedForward|String\.hxx|Base64|CommandLineArguments|Directory|DynamicLoader|Encoding|FStream|FundamentalType|Glob|MD5|Process|RegularExpression|System|SystemInformation|SystemTools)(C|CXX|UNIX)?\.' | xargs rm # Work around gcc 4.9.0 regression # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61294 sed -i -e 's/-Wl,--fatal-warnings//' VTK/CMake/vtkCompilerExtras.cmake @@ -508,6 +528,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sat Aug 22 2015 Orion Poplawski - 4.3.1-13 +- Note bundled kwsys, remove unused kwsys files + * Wed Aug 19 2015 Orion Poplawski - 4.3.1-12 - Do not ship static libraries