diff --git a/openscad-2014.03.src.tar.gz b/openscad-2014.03.src.tar.gz deleted file mode 100644 index 133f307..0000000 --- a/openscad-2014.03.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:865fdc637a3ceb0678d35e88995411d8e70e8a7937625d7ede147a1570a561c3 -size 4417283 diff --git a/openscad-2015.03.src.tar.gz b/openscad-2015.03.src.tar.gz new file mode 100644 index 0000000..4ab518e --- /dev/null +++ b/openscad-2015.03.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68ce08adc9e90c606ad948fe0f3405ce62b03b6bf34c45dd3dfc6b20c1846182 +size 12748351 diff --git a/openscad-desktop.patch b/openscad-desktop.patch deleted file mode 100644 index e9f73df..0000000 --- a/openscad-desktop.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 4769587..0000000 --- a/openscad-syntax-highlighting.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: openscad.pro -=================================================================== ---- 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 - - # Make experimental features available - experimental { diff --git a/openscad.changes b/openscad.changes index 1fc2df6..35a3012 100644 --- a/openscad.changes +++ b/openscad.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Mar 11 10:48:57 UTC 2015 - prusnak@opensuse.org + +- updated to 2015.03 + +------------------------------------------------------------------- +Wed Mar 10 00:31:52 UTC 2014 - prusnak@opensuse.org + +- updated to 2014.03 + ------------------------------------------------------------------- Wed Jun 19 09:14:01 UTC 2013 - prusnak@opensuse.org diff --git a/openscad.spec b/openscad.spec index 244bb94..932f592 100644 --- a/openscad.spec +++ b/openscad.spec @@ -17,25 +17,25 @@ Name: openscad -Version: 2014.03 +Version: 2015.03 Release: 0 Summary: Programmers Solid 3D CAD Modeller License: GPL-2.0+ Group: Productivity/Graphics/CAD Url: http://openscad.org/ 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 BuildRequires: libcgal-devel BuildRequires: opencsg-devel +BuildRequires: harfbuzz-devel %if 0%{?suse_version} BuildRequires: Mesa-devel BuildRequires: bison BuildRequires: libeigen3-devel BuildRequires: libqt4-devel +BuildRequires: libqscintilla-devel %endif %if 0%{?fedora_version} BuildRequires: byacc @@ -43,6 +43,7 @@ BuildRequires: eigen3-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: qt-devel +BuildRequires: qscintilla-devel %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,8 +59,6 @@ movies. %prep %setup -q -%patch0 -%patch1 %build %if 0%{?suse_version} @@ -87,5 +86,6 @@ rm -rf %{buildroot} %{_mandir}/man1/* %dir %{_datadir}/appdata %{_datadir}/appdata/openscad.appdata.xml +%{_datadir}/mime/packages/openscad.xml %changelog