[printrun] Clean the spec a little

[Miro Hrončok]

commit ea8c7bd9c08496fb5d685a63b1fe592b24d9d650
Author: Miro Hrončok <miro at hroncok.cz>
Date:   Mon Dec 29 11:54:28 2014 +0100

    Clean the spec a little

 printrun.spec |   50 +++++---------------------------------------------
 1 files changed, 5 insertions(+), 45 deletions(-)
---
diff --git a/printrun.spec b/printrun.spec
index ef8f9a7..7fc76b3 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -4,7 +4,7 @@ Name:           printrun
 %global day     30
 Version:        %{year}.%{month}.%{day}
 %global tag     %{name}-%{year}%{month}%{day}
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        RepRap printer interface and tools
 # AppData is CC0
 License:        GPLv3+ and CC0
@@ -12,10 +12,6 @@ Group:          Applications/Engineering
 URL:            https://github.com/kliment/Printrun
 Source0:        https://github.com/kliment/Printrun/archive/%{tag}.tar.gz
 
-# prontserve is not yet ready for production
-# it also has some unresolved dependencies in Fedora
-%global prontserve 0
-
 # Use system's simarrange
 Patch0:         %{name}-simarrange.patch
 
@@ -51,10 +47,7 @@ This package contains common files.
 Summary:        CLI interface for RepRap
 Requires:       pyserial
 Requires:       %{name}-common = %{version}-%{release}
-%if 0%{?fedora} > 20
-# not to change arch in current releases
 BuildArch:      noarch
-%endif
 
 %description -n pronsole
 Pronsole is a featured command line G-code sender.
@@ -62,22 +55,6 @@ It controls the ReRap printer. It is a part of Printrun.
 
 ################################################
 
-%if 0%{?prontserve}
-%package     -n prontserve
-Summary:        Web interface for RepRap
-Requires:       python-tornado
-Requires:       pronsole = %{version}-%{release}
-%if 0%{?fedora} > 20
-BuildArch:      noarch
-%endif
-
-%description -n prontserve
-Pronserve is a featured web G-code sender.
-It controls the ReRap printer. It is a part of Printrun.
-%endif
-
-################################################
-
 %package     -n pronterface
 Summary:        GUI interface for RepRap
 Requires:       wxPython
@@ -85,9 +62,7 @@ Requires:       python-cairosvg
 Requires:       python-pyglet
 Requires:       simarrange
 Requires:       pronsole = %{version}-%{release}
-%if 0%{?fedora} > 20
 BuildArch:      noarch
-%endif
 
 %description -n pronterface
 Pronterface is a featured G-code sender with graphical user interface.
@@ -101,9 +76,7 @@ Requires:       wxPython
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       python-pyglet
 Requires:       simarrange
-%if 0%{?fedora} > 20
 BuildArch:      noarch
-%endif
 
 %description -n plater
 Plater is a GUI tool to prepare printing plate from STL files for ReRap.
@@ -142,13 +115,6 @@ for FILE in *.py; do
   mv -f $FILE ${FILE%.py}
 done
 
-# Backward compatibility symlinks
-%if 0%{?fedora} < 20
-for FILE in *; do
-  ln -sf $FILE $FILE.py
-done
-%endif
-
 cd -
 
 # desktop files
@@ -162,10 +128,6 @@ cp -ar %{buildroot}%{_datadir}/pronterface/locale/* %{buildroot}%{_datadir}/loca
 rm -rf %{buildroot}%{_datadir}/pronterface/locale
 ln -s -f %{_datadir}/locale/ %{buildroot}%{_datadir}/pronterface/ # the app expects the locale folder in here
 
-%if ! 0%{?prontserve}
-rm -f %{buildroot}%{_bindir}/prontserve*
-%endif
-
 %{find_lang} pronterface
 %{find_lang} plater
 
@@ -189,12 +151,6 @@ rm -f %{buildroot}%{_bindir}/prontserve*
 %{_datadir}/appdata/pronsole.appdata.xml
 %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
@@ -216,6 +172,10 @@ rm -f %{buildroot}%{_bindir}/prontserve*
 %doc README* COPYING
 
 %changelog
+* Mon Dec 29 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.07.30-4
+- Remove prontserve from the spec
+- Remove Fedora <> 20 conditions
+
 * Sat Oct 25 2014 Miro Hrončok <mhroncok at redhat.com> - 2014.07.30-3
 - Do not longer depend on skeinforge, as it appears nobody uses it