[printrun] New upstream release printrun-20130711
Miro Hrončok
churchyard at fedoraproject.org
Wed Jul 24 13:44:03 UTC 2013
commit 9bd0d18f7ed7fa809841b422691b3bf9eed9bc3a
Author: Miro Hrončok <miro at hroncok.cz>
Date: Wed Jul 24 15:43:27 2013 +0200
New upstream release printrun-20130711
.gitignore | 1 +
printrun-flush.patch | 13 -------------
printrun-plater-not-installed.patch | 16 ++++++++--------
printrun.spec | 27 ++++++++++++++-------------
sources | 2 +-
5 files changed, 24 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 065d84f..2cb49cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/printrun-0.0-5897fbc.tar.gz
/printrun-0.0-71e5da0.tar.gz
/printrun-0.0-80e313d.tar.gz
+/printrun-0.0-b8f549b.tar.gz
diff --git a/printrun-plater-not-installed.patch b/printrun-plater-not-installed.patch
index 544c378..2b3482c 100644
--- a/printrun-plater-not-installed.patch
+++ b/printrun-plater-not-installed.patch
@@ -1,20 +1,20 @@
diff --git a/pronterface.py b/pronterface.py
-index 89536eb..a1dbc90 100755
+index 1c91fd2..e450c5a 100755
--- a/pronterface.py
+++ b/pronterface.py
-@@ -561,9 +561,12 @@ class PronterWindow(MainWindow, pronsole.pronsole):
+@@ -704,9 +704,12 @@ class PronterWindow(MainWindow, pronsole.pronsole):
e.Skip()
def plate(self, e):
- import plater
-- print "plate function activated"
-- plater.stlwin(size = (800, 580), callback = self.platecb, parent = self).Show()
+- print _("Plate function activated")
+- plater.stlwin(size = (800, 580), callback = self.platecb, parent = self, build_dimensions = self.build_dimensions_list).Show()
+ try:
+ import plater
-+ print "plate function activated"
-+ plater.stlwin(size = (800, 580), callback = self.platecb, parent = self).Show()
++ print _("Plate function activated")
++ plater.stlwin(size = (800, 580), callback = self.platecb, parent = self, build_dimensions = self.build_dimensions_list).Show()
+ except ImportError:
-+ print "to activate this feature, install package plater."
+++ print "To activate this feature, install package plater"
def platecb(self, name):
- print "plated: "+name
+ print _("Plated %s") % name
diff --git a/printrun.spec b/printrun.spec
index 806d535..c12b2f7 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -1,13 +1,13 @@
-%global commit 80e313dc000353bba29cebafc8ad9802b5aa9d8b
+%global commit b8f549b6d851651fd116f752f244e25f01763017
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global datestamp 20130604
+%global datestamp 20130711
%global snapshot %{datestamp}git%{shortcommit}
# prontserve is not yet ready for production
# it also has some unresolved dependencies in Fedora
%global prontserve 0
Name: printrun
Version: 0.0
-Release: 27.%{snapshot}%{?dist}
+Release: 28.%{snapshot}%{?dist}
Summary: RepRap printer interface and tools
License: GPLv3+
Group: Applications/Engineering
@@ -21,10 +21,6 @@ Source3: plater.desktop
Patch0: %{name}-plater-not-installed.patch
-# https://github.com/kliment/Printrun/issues/402
-Patch1: %{name}-flush.patch
-
-BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -107,7 +103,6 @@ It is a part of Printrun.
%prep
%setup -qn Printrun-%{commit}
%patch0 -p1
-%patch1 -p1
# use launchers for skeinforge
sed -i 's|python skeinforge/skeinforge_application/skeinforge.py|skeinforge|' pronsole.py
@@ -139,7 +134,7 @@ rm -rf %{buildroot}%{_datadir}/pronterface/locale
ln -s -f %{_datadir}/locale/ %{buildroot}%{_datadir}/pronterface/ # the app expects the locale folder in here
# exacutables
-cd %{buildroot}%{python_sitelib}/%{name}
+cd %{buildroot}%{python_sitearch}/%{name}
chmod +x gcview.py graph.py stlview.py SkeinforgeQuickEditDialog.py calibrateextruder.py
cd -
@@ -154,8 +149,8 @@ rm -f %{buildroot}%{_bindir}/prontserve.*
%doc README* COPYING
%files common
-%{python_sitelib}/%{name}
-%{python_sitelib}/Printrun*
+%{python_sitearch}/%{name}
+%{python_sitearch}/Printrun*
%{_bindir}/printcore.*
%doc README* COPYING
@@ -185,6 +180,12 @@ rm -f %{buildroot}%{_bindir}/prontserve.*
%doc README* COPYING
%changelog
+* Wed Jul 24 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-28.20130711gitb8f549b
+- New upstream tag release
+- Corrected bogus date in %%changelog
+- Flush patch no longer needed
+- No longer NoArch
+
* Thu Jun 20 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-27.20130604git80e313d
- Added patch to solve upstream issue 402
@@ -264,10 +265,10 @@ rm -f %{buildroot}%{_bindir}/prontserve.*
* Thu Oct 04 2012 Miro Hrončok <miro at hroncok.cz> - 0.0-7-20120924gitb6935b93
- New sources links
-* Fri Sep 22 2012 Miro Hrončok <miro at hroncok.cz> - 0.0-6-20120924gitb6935b93
+* Sat Sep 22 2012 Miro Hrončok <miro at hroncok.cz> - 0.0-6-20120924gitb6935b93
- New commits, inlude the license
-* Fri Sep 22 2012 Miro Hrončok <miro at hroncok.cz> - 0.0-5-20120921gitdceaf26f
+* Sat Sep 22 2012 Miro Hrončok <miro at hroncok.cz> - 0.0-5-20120921gitdceaf26f
- launching scripts now pass the params
* Fri Sep 21 2012 Miro Hrončok <miro at hroncok.cz> - 0.0-4-20120921gitdceaf26f
diff --git a/sources b/sources
index 9a952bd..25e74e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdc43ab6db939d34dcf5a79477389f4e printrun-0.0-80e313d.tar.gz
+df46125eefcb874800ef376acc1a6352 printrun-0.0-b8f549b.tar.gz
More information about the scm-commits
mailing list