From 9ff7538473570db578cb94b37369f29f02ac1243 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Mar 09 2014 23:38:37 +0000
Subject: New version


---

diff --git a/.gitignore b/.gitignore
index 3decad2..07ac233 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /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
diff --git a/openscad-482.patch b/openscad-482.patch
deleted file mode 100644
index aeec7cd..0000000
--- a/openscad-482.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/mainwin.cc b/src/mainwin.cc
-index 95f7242..db6b252 100644
---- a/src/mainwin.cc
-+++ b/src/mainwin.cc
-@@ -1067,7 +1067,9 @@ bool MainWindow::compileTopLevelDocument(bool reload)
- 	  // if we haven't yet compiled the current text.
- 		else if (!editor->isContentModified()) {
- 			QString current_doc = editor->toPlainText();
--			if (current_doc != last_compiled_doc) shouldcompiletoplevel = true;
-+			if (current_doc != last_compiled_doc && last_compiled_doc.size() == 0) {
-+				shouldcompiletoplevel = true;
-+			}
- 		}
- 	}
- 	
diff --git a/openscad-stdint.patch b/openscad-stdint.patch
deleted file mode 100644
index e19e432..0000000
--- a/openscad-stdint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/dxfdim.cc b/src/dxfdim.cc
-index a241b87..8f55a2f 100644
---- a/src/dxfdim.cc
-+++ b/src/dxfdim.cc
-@@ -36,6 +36,8 @@
- #include "mathc99.h"
- #include <sstream>
- 
-+#include <stdint.h>
-+
- #include <boost/filesystem.hpp>
- boost::unordered_map<std::string,Value> dxf_dim_cache;
- boost::unordered_map<std::string,Value> dxf_cross_cache;
diff --git a/openscad.appdata.xml b/openscad.appdata.xml
deleted file mode 100644
index 0378d15..0000000
--- a/openscad.appdata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application>
- <id type="desktop">openscad.desktop</id>
- <licence>CC0</licence>
- <summary>The Programmers Solid 3D CAD Modeller</summary>
- <description>
-  <p>OpenSCAD is a software for creating solid 3D CAD models. Unlike most free software for creating 3D models (such as Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.</p>
-  <p>OpenSCAD is not an interactive modeller. Instead it is something like a 3D-compiler that reads in a script file that describes the object and renders the 3D model from this script file. This gives you (the designer) full control over the modelling process and enables you to easily change any step in the modelling process or make designs that are defined by configurable parameters.</p>
-  <p>OpenSCAD provides two main modelling techniques: First there is constructive solid geometry (aka CSG) and second there is extrusion of 2D outlines. As data exchange format format for this 2D outlines Autocad DXF files are used. In addition to 2D paths for extrusion it is also possible to read design parameters from DXF files. Besides DXF files OpenSCAD can read and create 3D models in the STL and OFF file formats.</p>
- </description>
- <screenshots>
-  <screenshot type="default" width="800" height="437">http://www.openscad.org/images/appdata-screenshot-1.png</screenshot>
-  <screenshot width="800" height="465">http://www.openscad.org/images/appdata-screenshot-2.png</screenshot>
- </screenshots>
- <url type="homepage">http://www.openscad.org/</url>
-</application>
diff --git a/openscad.spec b/openscad.spec
index dc350a6..922de57 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -1,28 +1,21 @@
 Name:           openscad
-%global shortversion 2013.06
+%global shortversion 2014.03
 Version:        %{shortversion}
-Release:        8%{?dist}
+Release:        1%{?dist}
 Summary:        The Programmers Solid 3D CAD Modeller
 # COPYING contains a linking exception for CGAL
 # AppData is CC0
 License:        GPLv2 with exceptions and CC0
 Group:          Applications/Engineering
 URL:            http://www.openscad.org/
-Source0:        https://openscad.googlecode.com/files/%{name}-%{shortversion}.src.tar.gz
-Source1:        https://raw.github.com/%{name}/%{name}/107d19e93e9e12bfa3bf1d480b311ed718004b68/%{name}.appdata.xml
-
-Patch0:         %{name}-stdint.patch
-
-# https://github.com/openscad/openscad/commit/2e21f3deff585731d5377490cde87eeccd917445
-Patch482:       %{name}-482.patch
-
+Source0:        http://files.openscad.org/openscad-%{shortversion}.src.tar.gz
 BuildRequires:  CGAL-devel >= 3.6
 BuildRequires:  ImageMagick
 BuildRequires:  Xvfb
 BuildRequires:  bison >= 2.4
 BuildRequires:  boost-devel >= 1.3.5
 BuildRequires:  desktop-file-utils
-BuildRequires:  eigen2-devel >= 2.0.13
+BuildRequires:  eigen3-devel
 BuildRequires:  flex >= 2.5.35
 BuildRequires:  glew-devel >= 1.6
 BuildRequires:  glib2-devel
@@ -45,8 +38,6 @@ interested in creating computer-animated movies.
 
 %prep
 %setup -qn %{name}-%{shortversion}
-%patch0 -p1
-%patch482 -p1
 
 %build
 qmake-qt4 VERSION=%{shortversion} PREFIX=%{_prefix}
@@ -98,6 +89,9 @@ cd -
 %{_mandir}/man1/*
 
 %changelog
+* Sun Mar 09 2014 Miro Hrončok <mhroncok@redhat.com> - 2014.03-1
+- New version
+
 * Fri Dec 27 2013 Miro Hrončok <mhroncok@redhat.com> - 2013.06-8
 - Enable Xvfb tests
 - Add AppData from upstream git
diff --git a/sources b/sources
index 96c9925..5ae5a5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7b5faecdffc41e28cdf0c1162299de7  openscad-2013.06.src.tar.gz
+38bebd02bce365fe39e695a07411ab73  openscad-2014.03.src.tar.gz