diff --git a/openscad-2013.06.src.tar.gz b/openscad-2013.06.src.tar.gz deleted file mode 100644 index 65e4b08..0000000 --- a/openscad-2013.06.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f277a8c3e6a548272f95279e50de6d4a6d73552775ab7a33c7f837c8e59173df -size 4083085 diff --git a/openscad-2014.03.src.tar.gz b/openscad-2014.03.src.tar.gz new file mode 100644 index 0000000..133f307 --- /dev/null +++ b/openscad-2014.03.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3 +size 4417283 diff --git a/openscad-desktop.patch b/openscad-desktop.patch new file mode 100644 index 0000000..e9f73df --- /dev/null +++ b/openscad-desktop.patch @@ -0,0 +1,12 @@ +Index: icons/openscad.desktop +=================================================================== +--- icons/openscad.desktop.orig ++++ icons/openscad.desktop +@@ -4,5 +4,5 @@ Version=1.0 + Name=OpenSCAD + Icon=openscad + Exec=openscad %f +-MimeType=application/x-openscad +-Categories=Graphics;3DGraphics;Engineering;Development; ++MimeType=application/x-openscad; ++Categories=Graphics;3DGraphics;Engineering; diff --git a/openscad-syntax-highlighting.patch b/openscad-syntax-highlighting.patch index 56b7931..4769587 100644 --- a/openscad-syntax-highlighting.patch +++ b/openscad-syntax-highlighting.patch @@ -1,13 +1,13 @@ -Index: openscad-2013.06/openscad.pro +Index: openscad.pro =================================================================== ---- openscad-2013.06.orig/openscad.pro -+++ openscad-2013.06/openscad.pro -@@ -157,7 +157,7 @@ CONFIG += boost - CONFIG += eigen +--- openscad.pro.orig ++++ openscad.pro +@@ -155,7 +155,7 @@ CONFIG += eigen + CONFIG += glib-2.0 #Uncomment the following line to enable QCodeEdit -#CONFIG += qcodeedit +CONFIG += qcodeedit - mdi { - DEFINES += ENABLE_MDI + # Make experimental features available + experimental { diff --git a/openscad.spec b/openscad.spec index 22e1eb4..ec68ab3 100644 --- a/openscad.spec +++ b/openscad.spec @@ -3,14 +3,15 @@ # Name: openscad -Version: 2013.06 +Version: 2014.03 Release: 1 License: GPLv2+ Summary: Programmers Solid 3D CAD Modeller Url: http://openscad.org/ Group: Productivity/Graphics/CAD -Source: https://openscad.googlecode.com/files/openscad-%{version}.src.tar.gz +Source: http://files.openscad.org/%{name}-%{version}.src.tar.gz Patch0: %{name}-syntax-highlighting.patch +Patch1: %{name}-desktop.patch BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: glew-devel @@ -18,13 +19,13 @@ BuildRequires: libcgal-devel BuildRequires: opencsg-devel %if 0%{?suse_version} BuildRequires: bison -BuildRequires: libeigen2-devel +BuildRequires: libeigen3-devel BuildRequires: libqt4-devel BuildRequires: Mesa-devel %endif %if 0%{?fedora_version} BuildRequires: byacc -BuildRequires: eigen2-devel +BuildRequires: eigen3-devel BuildRequires: qt-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel @@ -43,7 +44,8 @@ movies. %prep %setup -q -%patch0 -p1 +%patch0 +%patch1 %build %if 0%{?suse_version} @@ -52,7 +54,7 @@ qmake PREFIX=%{_prefix} %if 0%{?fedora_version} qmake-qt4 PREFIX=%{_prefix} %endif -make %{?_smp_mflags} +make # %{?_smp_mflags} # don't use parallel build %install make INSTALL_ROOT=%{buildroot} install