[printrun] New upstream "release"

[Miro Hrončok]

commit e0152d42c80639b20e3ff05130849de4358acab7
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Tue Jun 18 16:40:18 2013 +0200

    New upstream "release"

 printrun-pyglet12.patch |   24 -----------------------
 printrun.spec           |   48 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 33 deletions(-)
---
diff --git a/printrun.spec b/printrun.spec
index 380bf0c..40e6d37 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -1,9 +1,13 @@
-%global commit 71e5da009ae8de5e09cbb6dabf46a90cd2e8a62c
+%global commit 80e313dc000353bba29cebafc8ad9802b5aa9d8b
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global snapshot 20130123git%{shortcommit}
+%global datestamp 20130604
+%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:        25.%{snapshot}%{?dist}
+Release:        26.%{snapshot}%{?dist}
 Summary:        RepRap printer interface and tools
 License:        GPLv3+
 Group:          Applications/Engineering
@@ -15,8 +19,7 @@ Source1:        pronsole.desktop
 Source2:        pronterface.desktop
 Source3:        plater.desktop
 
-Patch0:         %{name}-pyglet12.patch
-Patch1:         %{name}-plater-not-installed.patch
+Patch0:         %{name}-plater-not-installed.patch
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -55,7 +58,21 @@ Pronsole is a featured command line G-code sender.
 It controls the ReRap printer and integrates skeinforge.
 It is a part of Printrun.
 
-###############################################
+################################################
+
+%if 0%{?prontserve}
+%package     -n prontserve
+Summary:        Web interface for RepRap
+Requires:       python-tornado
+Requires:       pronsole = %{version}-%{release}
+
+%description -n prontserve
+Pronserve is a featured web G-code sender.
+It controls the ReRap printer and integrates skeinforge.
+It is a part of Printrun.
+%endif
+
+################################################
 
 %package     -n pronterface
 Summary:        GUI interface for RepRap
@@ -87,7 +104,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
@@ -120,9 +136,13 @@ ln -s -f %{_datadir}/locale/ %{buildroot}%{_datadir}/pronterface/ # the app expe
 
 # exacutables
 cd %{buildroot}%{python_sitelib}/%{name}
-chmod +x gcview.py graph.py stlview.py SkeinforgeQuickEditDialog.py calibrateextruder.py webinterface.py
+chmod +x gcview.py graph.py stlview.py SkeinforgeQuickEditDialog.py calibrateextruder.py
 cd -
 
+%if ! 0%{?prontserve}
+rm -f %{buildroot}%{_bindir}/prontserve.*
+%endif
+
 %{find_lang} pronterface
 %{find_lang} plater
 
@@ -137,11 +157,16 @@ cd -
 
 %files -n pronsole
 %{_bindir}/pronsole.*
-%{_bindir}/gcoder.*
 %{_datadir}/pixmaps/pronsole.ico
 %{_datadir}/applications/pronsole.desktop
 %doc README* COPYING
 
+%if 0%{?prontserve}
+%files -n prontserve
+%{_bindir}/prontserve.*
+%doc README* COPYING
+%endif
+
 %files -n pronterface -f pronterface.lang
 %{_bindir}/pronterface.*
 %{_datadir}/pronterface
@@ -156,6 +181,11 @@ cd -
 %doc README* COPYING
 
 %changelog
+* Tue Jun 18 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-26.20130604git80e313d
+- Upstream released tag release 20130604
+- Pyglet 1.2 issue fixed in upstream, removed patch
+- Prepared spec for prontserve but do not produce the package yet (not all deps satisfied)
+
 * 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+