diff --git a/.gitignore b/.gitignore index 859f84c..f6a3a77 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -/openscad-2012.10.31.tar.gz -/openscad-2013.01.05.tar.gz -/openscad-2013.01.08.tar.gz -/openscad-2013.01.17-6ecf96b.tar.gz -/openscad-2013.01.src.tar.gz -/openscad-2013.06.src.tar.gz -/openscad-2014.03.src.tar.gz -/openscad-54ad8c20393bc459ee4aa5f226451451f5e864d6.tar.gz -/MCAD-85794e4b4f2294a1b445a4d928866bedd5cc64ec.tar.gz -/openscad-2015.03.src.tar.gz -/openscad-2015.03-1.src.tar.gz -/openscad-2015.03-2.src.tar.gz -/openscad-2015.03-3.src.tar.gz +/*.tar.gz diff --git a/openscad.spec b/openscad.spec index e9a4fe4..e67e09f 100644 --- a/openscad.spec +++ b/openscad.spec @@ -1,8 +1,6 @@ -%global mcadhash 5246f78d34904f728f49ea4ea30faa5041abc592 - Name: openscad -Version: 2019.01~RC2 -%global upversion 2019.01-RC2 +Version: 2019.05 +%global upversion %{version} Release: 1%{?dist} Summary: The Programmers Solid 3D CAD Modeller # COPYING contains a linking exception for CGAL @@ -10,9 +8,7 @@ Summary: The Programmers Solid 3D CAD Modeller # Examples are CC0 License: GPLv2 with exceptions and CC0 URL: http://www.%{name}.org/ -Source0: https://github.com/%{name}/%{name}/archive/%{name}-%{upversion}.tar.gz -# Source0: http://files.%%{name}.org/%%{name}-%%{upversion}.src.tar.gz -Source1: https://github.com/%{name}/MCAD/archive/%{mcadhash}.zip +Source0: http://files.%{name}.org/%{name}-%{upversion}.src.tar.gz Patch0: %{name}-polyclipping.patch BuildRequires: CGAL-devel >= 3.6 BuildRequires: ImageMagick @@ -20,6 +16,7 @@ BuildRequires: Xvfb BuildRequires: bison >= 2.4 BuildRequires: boost-devel >= 1.35 BuildRequires: desktop-file-utils +BuildRequires: double-conversion-devel BuildRequires: eigen3-devel BuildRequires: flex >= 2.5.35 BuildRequires: freetype-devel >= 2.4 @@ -134,9 +131,7 @@ changes, however many things are already working. ############################################### %prep -%autosetup -n %{name}-%{name}-%{upversion} -p1 -S git -a1 -mv MCAD-%{mcadhash}/* libraries/MCAD/ -rm -rf MCAD-%{mcadhash} +%autosetup -n %{name}-%{upversion} -p1 -S git # Unbundle polyclipping rm src/ext/polyclipping -rf @@ -206,6 +201,10 @@ cd - %{_datadir}/%{name}/libraries/MCAD/bitmap/*.scad %changelog +* Mon May 20 2019 Jason L Tibbitts III - 2019.05-1 +- Update to 2019.05. +- New build dependency double-conversion. + * Thu Feb 28 2019 Tom Callaway - 2019.01~RC2-1 - 2019.01-RC2 diff --git a/sources b/sources index b484cde..986ff7a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (openscad-2019.01-RC2.tar.gz) = 43a91f6f1276c6070d9cd45877b56ff50241d20ed50e63975254ad222ef45b79ff065b1e18145716ea5b9f51880ea4762f1c64cd348f485ef3f7a565e3e97eaf -SHA512 (5246f78d34904f728f49ea4ea30faa5041abc592.zip) = 6a3da3b3f8c6c1ae233bd7937d3cfab69b5e9daff851330b8e6f2d035a7536bd9e32fe5f80ec6dfcc78b5a96ff0faeee1d09769c83c4d6e29bdd48062299bf39 +SHA512 (openscad-2019.05.src.tar.gz) = 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13