From 9d993c7a55963431a188af3ca03c94cb610661ff Mon Sep 17 00:00:00 2001 From: Richard M. Shaw Date: May 28 2015 17:39:42 +0000 Subject: Fix version reporting in the About dialog (BZ#1192841). --- diff --git a/freecad-0.14-Version_h.patch b/freecad-0.14-Version_h.patch new file mode 100644 index 0000000..6309690 --- /dev/null +++ b/freecad-0.14-Version_h.patch @@ -0,0 +1,13 @@ +diff -Naur freecad-0.14.3702.orig/src/CMakeLists.txt freecad-0.14.3702/src/CMakeLists.txt +--- freecad-0.14.3702.orig/src/CMakeLists.txt 2015-05-28 11:24:13.393935311 -0500 ++++ freecad-0.14.3702/src/CMakeLists.txt 2015-05-28 11:24:03.937354886 -0500 +@@ -1,5 +1,7 @@ +- +-add_subdirectory(Build) ++# Do not generate a new Version.h if the source is a release tarball. ++if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Build/Version.h) ++ add_subdirectory(Build) ++endif() + add_subdirectory(Base) + add_subdirectory(App) + add_subdirectory(Main) diff --git a/freecad.spec b/freecad.spec index 582db9f..6352719 100644 --- a/freecad.spec +++ b/freecad.spec @@ -30,7 +30,7 @@ Name: freecad Epoch: 1 Version: 0.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general purpose 3D CAD modeler Group: Applications/Engineering @@ -45,6 +45,7 @@ Source104: freecad.sharedmimeinfo Patch0: freecad-3rdParty.patch Patch1: freecad-0.14-Xlib_h.patch Patch2: freecad-0.15-zipios.patch +Patch3: freecad-0.14-Version_h.patch # Utilities BuildRequires: cmake @@ -154,6 +155,7 @@ rm -rf src/CXX %endif %patch1 -p1 -b .Xlib_h %patch2 -p1 -b .zipios +%patch3 -p1 %if ! %{bundled_zipios} rm -rf src/zipios++ @@ -203,8 +205,6 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS make %{?_smp_mflags} -make doc - %install pushd build @@ -321,6 +321,9 @@ fi %changelog +* Thu May 28 2015 Richard Shaw - 0.15-5 +- Fix version reporting in the About dialog (BZ#1192841). + * Tue May 19 2015 Richard Shaw - 1:0.15-4 - Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to Coin2/Coin3 library mismatch between Freecad & python-pivy (BZ#1221713).