[printrun] New version

[Miro Hrončok]

commit 5d80665d281453dfe5495521663c81cdaad90b28
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Wed Jul 30 21:51:24 2014 +0200

    New version

 .gitignore                |    1 +
 printrun-bz1077126.patch  |   38 ---------------
 printrun-pngicons.patch   |  110 ---------------------------------------------
 printrun-simarrange.patch |   14 +++---
 printrun.spec             |   20 +++-----
 sources                   |    2 +-
 6 files changed, 17 insertions(+), 168 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d6d96e..0baf5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /printrun-0.0-b8f549b.tar.gz
 /printrun-20131019.tar.gz
 /printrun-20140126.tar.gz
+/printrun-20140730.tar.gz
diff --git a/printrun-simarrange.patch b/printrun-simarrange.patch
index 5b00718..6ce1cb2 100644
--- a/printrun-simarrange.patch
+++ b/printrun-simarrange.patch
@@ -1,13 +1,13 @@
-diff --git a/printrun/plater.py b/printrun/plater.py
-index f58ab3b..b74b66f 100644
---- a/printrun/plater.py
-+++ b/printrun/plater.py
-@@ -222,7 +222,7 @@ class StlPlater(Plater):
-                                           circular = circular_platform)
+diff --git a/printrun/stlplater.py b/printrun/stlplater.py
+index a0c19a0..77d5fca 100644
+--- a/printrun/stlplater.py
++++ b/printrun/stlplater.py
+@@ -266,7 +266,7 @@ class StlPlater(Plater):
+             self.menusizer.Add(cutpanel, pos = (nrows + 1, 0), span = (1, 2), flag = wx.EXPAND)
          else:
              viewer = showstl(self, (580, 580), (0, 0))
 -        self.simarrange_path = simarrange_path if simarrange_path else "./simarrange/sa"
 +        self.simarrange_path = simarrange_path if simarrange_path else "/usr/bin/simarrange"
          self.set_viewer(viewer)
  
-     def done(self, event, cb):
+     def start_cutting_tool(self, event, axis, direction):
diff --git a/printrun.spec b/printrun.spec
index b337ac3..1614b9b 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -1,10 +1,10 @@
 Name:           printrun
 %global year    2014
-%global month   01
-%global day     26
+%global month   07
+%global day     30
 Version:        %{year}.%{month}.%{day}
 %global tag     %{name}-%{year}%{month}%{day}
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        RepRap printer interface and tools
 # AppData is CC0
 License:        GPLv3+ and CC0
@@ -16,13 +16,9 @@ Source0:        https://github.com/kliment/Printrun/archive/%{tag}.tar.gz
 # it also has some unresolved dependencies in Fedora
 %global prontserve 0
 
+# Use system's simarrange
 Patch0:         %{name}-simarrange.patch
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1077126
-Patch1:         %{name}-bz1077126.patch
-
-# https://github.com/kliment/Printrun/pull/502
-Patch2:         %{name}-pngicons.patch
 
 BuildRequires:  Cython
 BuildRequires:  python2-devel
@@ -123,10 +119,6 @@ It is a part of Printrun.
 %prep
 %setup -qn Printrun-%{tag}
 %patch0 -p1
-%patch1 -p1
-
-%patch2 -p1
-mv P-face.png pronterface.png
 
 # use launchers for skeinforge
 sed -i 's|python skeinforge/skeinforge_application/skeinforge.py|skeinforge|' %{name}/pronsole.py
@@ -228,6 +220,10 @@ rm -f %{buildroot}%{_bindir}/prontserve*
 %doc README* COPYING
 
 %changelog
+* Wed Jul 30 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.07.30-1
+- New version
+- Remove merged patches
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.01.26-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 94c320b..aa8b216 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-44b8889e00693be7ae17768446a593da  printrun-20140126.tar.gz
+385761bd73ed19b6833a9440ed153221  printrun-20140730.tar.gz