[printrun] - When printrun is installed and plater not, don't crash when clicking Compose - Require pyglet for

Miro Hrončok churchyard at fedoraproject.org
Tue Jun 18 11:37:23 UTC 2013


commit f881a0de70933ab5c10e4635f2ae73ad7e90ffd6
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Jun 18 13:36:53 2013 +0200

    - When printrun is installed and plater not, don't crash when clicking Compose
    - Require pyglet for plater for F18+

 printrun.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/printrun.spec b/printrun.spec
index 98ed3a7..380bf0c 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -3,7 +3,7 @@
 %global snapshot 20130123git%{shortcommit}
 Name:           printrun
 Version:        0.0
-Release:        24.%{snapshot}%{?dist}
+Release:        25.%{snapshot}%{?dist}
 Summary:        RepRap printer interface and tools
 License:        GPLv3+
 Group:          Applications/Engineering
@@ -16,6 +16,7 @@ Source2:        pronterface.desktop
 Source3:        plater.desktop
 
 Patch0:         %{name}-pyglet12.patch
+Patch1:         %{name}-plater-not-installed.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -72,6 +73,9 @@ It is a part of Printrun.
 Summary:        RepRap STL plater
 Requires:       wxPython
 Requires:       %{name}-common = %{version}-%{release}
+%if 0%{?fedora} > 17
+Requires:       python-pyglet
+%endif
 
 %description -n plater
 Plater is a GUI tool to prepare printing plate from STL files for ReRap.
@@ -83,6 +87,7 @@ 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
@@ -151,6 +156,10 @@ cd -
 %doc README* COPYING
 
 %changelog
+* Tue Jun 18 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-25.20130123git71e5da0
+- When printrun is installed and plater not, don't crash when clicking Compose
+- Require pyglet for plater for F18+
+
 * Fri Jun 07 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-24.20130123git71e5da0
 - Fixed Pyglet 1.2 issue (#868266)
 


More information about the scm-commits mailing list