From 548dbec209683f0cd4bb38e75da2a69123ed899b Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Jun 19 2015 09:35:29 +0000 Subject: Update to 2015.03.10 --- diff --git a/.gitignore b/.gitignore index 13d92fb..a672712 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /printrun-20140126.tar.gz /printrun-20140730.tar.gz /printrun-20140801.tar.gz +/printrun-20150310.tar.gz diff --git a/printrun-simarrange.patch b/printrun-simarrange.patch deleted file mode 100644 index 6ce1cb2..0000000 --- a/printrun-simarrange.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 start_cutting_tool(self, event, axis, direction): diff --git a/printrun.spec b/printrun.spec index 75deaf0..212af51 100644 --- a/printrun.spec +++ b/printrun.spec @@ -1,10 +1,10 @@ Name: printrun -%global year 2014 -%global month 08 -%global day 01 +%global year 2015 +%global month 03 +%global day 10 Version: %{year}.%{month}.%{day} %global tag %{name}-%{year}%{month}%{day} -Release: 2%{?dist} +Release: 1%{?dist} Summary: RepRap printer interface and tools # AppData is CC0 License: GPLv3+ and CC0 @@ -12,9 +12,6 @@ Group: Applications/Engineering URL: https://github.com/kliment/Printrun Source0: https://github.com/kliment/Printrun/archive/%{tag}.tar.gz -# Use system's simarrange -Patch0: %{name}-simarrange.patch - BuildRequires: Cython BuildRequires: python2-devel @@ -91,7 +88,6 @@ It is a part of Printrun. %prep %setup -qn Printrun-%{tag} -%patch0 -p1 # remove bundled skeinforge link sed -i 's|python skeinforge/skeinforge_application/skeinforge.py|set-your-slicer-in-settings|' %{name}/settings.py @@ -176,6 +172,10 @@ ln -s -f %{_datadir}/locale/ %{buildroot}%{_datadir}/pronterface/ # the app expe %doc README* COPYING %changelog +* Fri Jun 19 2015 Miro Hrončok - 2015.03.10-1 +- Update to 2015.03.10 +- Removed no longer needed simarrange patch + * Thu Jun 18 2015 Fedora Release Engineering - 2014.08.01-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e38bdef..3ad6748 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -779fde3febefd31e9c6ec91013fedb1e printrun-20140801.tar.gz +8bd4d3bba4ac84707003f7309c67403d printrun-20150310.tar.gz