hobbes1069 pushed to freecad (f20). "Merge branch 'f21' into f20"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 25 17:24:24 UTC 2015
From d0f96b71e6016bd2c9f475973aeea9c7fd6ccabc Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Tue, 19 May 2015 08:24:38 -0500
Subject: Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to
Coin2/Coin3
library mismatch between Freecad & python-pivy (BZ#1221713).
diff --git a/freecad.spec b/freecad.spec
index 95a10ab..73af8dc 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -28,6 +28,7 @@
Name: freecad
+Epoch: 1
Version: 0.15
Release: 1%{?dist}
Summary: A general purpose 3D CAD modeler
@@ -320,6 +321,10 @@ fi
%changelog
+* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-1
+- Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to Coin2/Coin3
+ library mismatch between Freecad & python-pivy (BZ#1221713).
+
* Fri Apr 10 2015 Richard Shaw <hobbes1069 at gmail.com> - 0.15-1
- Update to latest upstream release.
--
cgit v0.10.2
From b2f6f26bbabf0caa49746917ea39f4e2b832a635 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Tue, 19 May 2015 08:25:15 -0500
Subject: Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to
Coin2/Coin3
library mismatch between Freecad & python-pivy (BZ#1221713).
diff --git a/freecad.spec b/freecad.spec
index 73af8dc..f19d406 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -30,7 +30,7 @@
Name: freecad
Epoch: 1
Version: 0.15
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -321,7 +321,7 @@ fi
%changelog
-* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-1
+* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-2
- Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to Coin2/Coin3
library mismatch between Freecad & python-pivy (BZ#1221713).
--
cgit v0.10.2
From c35a14e7465d5f2e98b67bea4a669659b13786fd Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Wed, 20 May 2015 07:57:01 -0500
Subject: Set epoch requirement for noarch data package.
diff --git a/freecad.spec b/freecad.spec
index f19d406..12a8111 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -30,7 +30,7 @@
Name: freecad
Epoch: 1
Version: 0.15
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -100,7 +100,7 @@ BuildRequires: libappstream-glib
# Packages separated because they are noarch, but not optional so require them
# here.
-Requires: %{name}-data = %{version}-%{release}
+Requires: %{name}-data = %{epoch}:%{version}-%{release}
# Obsolete old doc package since it's required for functionality.
Obsoletes: %{name}-doc < 0.13-5
@@ -321,7 +321,7 @@ fi
%changelog
-* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-2
+* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-3
- Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to Coin2/Coin3
library mismatch between Freecad & python-pivy (BZ#1221713).
--
cgit v0.10.2
From 4ecb74a9877c266c9ad529cefa3f71d1c9a57bba Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Thu, 21 May 2015 10:42:57 -0500
Subject: Really set epoch on noarch sub-package.
diff --git a/freecad.spec b/freecad.spec
index 12a8111..582db9f 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -30,7 +30,7 @@
Name: freecad
Epoch: 1
Version: 0.15
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -139,7 +139,7 @@ modifying the core system.
%package data
Summary: Data files for FreeCAD
BuildArch: noarch
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description data
Data files for FreeCAD
@@ -321,7 +321,7 @@ fi
%changelog
-* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-3
+* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 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).
--
cgit v0.10.2
From 0f4e61e1b1c878cd15205a254fb46e7fc592c457 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Fri, 22 May 2015 14:38:38 -0500
Subject: Update spec to downgrade to 0.14, fixes BZ#1221713.
diff --git a/freecad.spec b/freecad.spec
index 582db9f..ecc2cb5 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -7,8 +7,8 @@
# Some plugins go in the Mod folder instead of lib. Deal with those here:
%global mod_plugins Mod/PartDesign
-# This revision is 0.15 final.
-%global rev 4671
+# This revision is 0.14 final.
+%global rev 3702
# Temporary workaround for cmake/boost bug:
# http://public.kitware.com/Bug/view.php?id=13446
@@ -29,8 +29,8 @@
Name: freecad
Epoch: 1
-Version: 0.15
-Release: 4%{?dist}
+Version: 0.14
+Release: 7%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -44,7 +44,8 @@ Source104: freecad.sharedmimeinfo
Patch0: freecad-3rdParty.patch
Patch1: freecad-0.14-Xlib_h.patch
-Patch2: freecad-0.15-zipios.patch
+Patch2: freecad-0.14-zipios.patch
+Patch3: freecad-0.14-DraftSnap.patch
# Utilities
BuildRequires: cmake
@@ -67,7 +68,7 @@ BuildRequires: OCE-devel
# Temporary fix for OCE-devel not pulling in draw package
BuildRequires: OCE-draw
%endif
-BuildRequires: Coin3-devel
+BuildRequires: Coin2-devel
BuildRequires: python2-devel
BuildRequires: boost-devel
BuildRequires: eigen3-devel
@@ -154,6 +155,7 @@ rm -rf src/CXX
%endif
%patch1 -p1 -b .Xlib_h
%patch2 -p1 -b .zipios
+%patch3 -p1 -b .draft_snap
%if ! %{bundled_zipios}
rm -rf src/zipios++
@@ -182,8 +184,8 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
-DRESOURCEDIR=%{_datadir}/%{name} \
- -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin3 \
- -DCOIN3D_DOC_PATH=%{_datadir}/Coin3/Coin \
+ -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \
+ -DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \
-DFREECAD_USE_EXTERNAL_PIVY=TRUE \
%if %{occ}
-DUSE_OCC=TRUE \
@@ -321,7 +323,7 @@ fi
%changelog
-* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.15-4
+* Tue May 19 2015 Richard Shaw <hobbes1069 at gmail.com> - 1:0.14-7
- Bump Epoch to downgrade to 0.14 for Fedora 21 and below due to Coin2/Coin3
library mismatch between Freecad & python-pivy (BZ#1221713).
--
cgit v0.10.2
From c950083d0f4f91110bddcdcaed391ccd1bad1647 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Mon, 25 May 2015 10:00:55 -0500
Subject: Clean up for downgrade to 0.14.
diff --git a/freecad-0.15-zipios.patch b/freecad-0.15-zipios.patch
deleted file mode 100644
index 1cd9b0f..0000000
--- a/freecad-0.15-zipios.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur freecad-0.15.4671.orig/src/Base/CMakeLists.txt freecad-0.15.4671/src/Base/CMakeLists.txt
---- freecad-0.15.4671.orig/src/Base/CMakeLists.txt 2015-04-05 12:25:02.000000000 -0500
-+++ freecad-0.15.4671/src/Base/CMakeLists.txt 2015-04-11 07:19:09.729155453 -0500
-@@ -301,9 +301,11 @@
- # Use external zipios++ if specified.
- if(FREECAD_USE_EXTERNAL_ZIPIOS)
- find_library(ZIPIOS_LIBRARY zipios)
-- find_path(ZIPIOS_INCLUDES zipios++/zipios-config.h)
-+ find_path(ZIPIOS_INCLUDES NAMES
-+ zipios++/zipios-config.h
-+ zipios++/zipios-config.hpp)
- if(ZIPIOS_LIBRARY)
-- message(STATUS "Found zipios++: ${ZIPIOS}")
-+ message(STATUS "Found zipios++: ${ZIPIOS_LIBRARY}")
- endif()
- if(ZIPIOS_INCLUDES)
- message(STATUS "Found zipios++ headers.")
diff --git a/sources b/sources
index 42e8b03..2a38388 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fe88e3647fe15e770e1b5c631424579 freecad_0.15.4671.tar.gz
+234747bdff47a62fd10cb902f3dd772b freecad-0.14.3702.tar.gz
--
cgit v0.10.2
From 36bdcb95520c08eac5e8175512aca27916baa030 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Mon, 25 May 2015 10:04:18 -0500
Subject: Fix source macro.
diff --git a/freecad.spec b/freecad.spec
index ecc2cb5..474589c 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -36,7 +36,7 @@ Group: Applications/Engineering
License: GPLv2+
URL: http://sourceforge.net/apps/mediawiki/free-cad/
-Source0: http://downloads.sourceforge.net/free-cad/%{name}_%{version}%{?rev:.%{rev}}.tar.gz
+Source0: http://downloads.sourceforge.net/free-cad/%{name}-%{version}%{?rev:.%{rev}}.tar.gz
Source101: freecad.desktop
Source102: freecad.1
Source103: freecad.appdata.xml
--
cgit v0.10.2
From 2d487c73b760d34bba913536dc576bce538b37b8 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Mon, 25 May 2015 10:07:52 -0500
Subject: Fix patch for downgrade.
diff --git a/freecad.spec b/freecad.spec
index 474589c..99f6007 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -44,7 +44,7 @@ Source104: freecad.sharedmimeinfo
Patch0: freecad-3rdParty.patch
Patch1: freecad-0.14-Xlib_h.patch
-Patch2: freecad-0.14-zipios.patch
+Patch2: freecad-0.14-smesh.patch
Patch3: freecad-0.14-DraftSnap.patch
# Utilities
--
cgit v0.10.2
From 5e86dea8f606740ba29152710e372287161275d1 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Mon, 25 May 2015 10:44:56 -0500
Subject: Fix plugin scanning.
diff --git a/freecad.spec b/freecad.spec
index 99f6007..5c4789d 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -2,7 +2,7 @@
# Maintainers: keep this list of plugins up to date
# List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here
-%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Spreadsheet SpreadsheetGui
+%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Spreadsheet SpreadsheetGui Assembly AssemblyGui
# Some plugins go in the Mod folder instead of lib. Deal with those here:
%global mod_plugins Mod/PartDesign
--
cgit v0.10.2
From 0b2c64a00894b27b39bcded9e0bb5055af6da641 Mon Sep 17 00:00:00 2001
From: "Richard M. Shaw" <hobbes1069 at gmail.com>
Date: Mon, 25 May 2015 10:59:08 -0500
Subject: Fix plugin scanning.
diff --git a/freecad.spec b/freecad.spec
index 5c4789d..de07da7 100644
--- a/freecad.spec
+++ b/freecad.spec
@@ -2,7 +2,7 @@
# Maintainers: keep this list of plugins up to date
# List plugins in %%{_libdir}/freecad/lib, less '.so' and 'Gui.so', here
-%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Spreadsheet SpreadsheetGui Assembly AssemblyGui
+%global plugins Complete Drawing Fem FreeCAD Image Import Inspection Mesh MeshPart Part Points QtUnit Raytracing ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Assembly AssemblyGui
# Some plugins go in the Mod folder instead of lib. Deal with those here:
%global mod_plugins Mod/PartDesign
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/freecad.git/commit/?h=f20&id=5b97140fdf5173c4ea8c910b2c908cb714731d83
More information about the scm-commits
mailing list