[printrun] Fixed #1004973, added compat symlinks
Miro Hrončok
churchyard at fedoraproject.org
Fri Sep 6 14:07:25 UTC 2013
commit cb92866a0f99031f2f1b1bc1b7987112ae034b80
Author: Miro Hrončok <miro at hroncok.cz>
Date: Fri Sep 6 16:06:40 2013 +0200
Fixed #1004973, added compat symlinks
printrun.spec | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/printrun.spec b/printrun.spec
index 15979c3..da9b85b 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -7,7 +7,7 @@
%global prontserve 0
Name: printrun
Version: 0.0
-Release: 31.%{snapshot}%{?dist}
+Release: 32.%{snapshot}%{?dist}
Summary: RepRap printer interface and tools
License: GPLv3+
Group: Applications/Engineering
@@ -21,6 +21,10 @@ Source3: plater.desktop
Patch0: %{name}-plater-not-installed.patch
+# https://github.com/kliment/Printrun/commit/617a86468771740d357dbb046038ff2fcb0ce997
+# https://bugzilla.redhat.com/show_bug.cgi?id=1004973
+Patch1: %{name}-missing-plater-import.patch
+
BuildRequires: Cython
BuildRequires: python2-devel
BuildRequires: desktop-file-utils
@@ -104,6 +108,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
@@ -135,6 +140,15 @@ for SCRIPT in prontserve pronterface; do
mv %{buildroot}%{_bindir}/${SCRIPT}{.py,}
done
+# Backward compatibility symlinks
+%if 0%{?fedora} && 0%{?fedora} < 20
+cd %{buildroot}%{_bindir}
+for FILE in *; do
+ln -sf $FILE $FILE.py
+done
+cd -
+%endif
+
# desktop files
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
@@ -152,7 +166,7 @@ chmod +x gcview.py graph.py stlview.py SkeinforgeQuickEditDialog.py calibrateext
cd -
%if ! 0%{?prontserve}
-rm -f %{buildroot}%{_bindir}/prontserve
+rm -f %{buildroot}%{_bindir}/prontserve*
%endif
%{find_lang} pronterface
@@ -164,12 +178,12 @@ rm -f %{buildroot}%{_bindir}/prontserve
%files common
%{python_sitearch}/%{name}
%{python_sitearch}/Printrun*
-%{_bindir}/printcore
+%{_bindir}/printcore*
%{python_sitelib}/printcore.py*
%doc README* COPYING
%files -n pronsole
-%{_bindir}/pronsole
+%{_bindir}/pronsole*
%{python_sitelib}/pronsole.py*
%{_datadir}/pixmaps/pronsole.ico
%{_datadir}/applications/pronsole.desktop
@@ -177,25 +191,30 @@ rm -f %{buildroot}%{_bindir}/prontserve
%if 0%{?prontserve}
%files -n prontserve
-%{_bindir}/prontserve
+%{_bindir}/prontserve*
%doc README* COPYING
%endif
%files -n pronterface -f pronterface.lang
-%{_bindir}/pronterface
+%{_bindir}/pronterface*
%{_datadir}/pronterface
%{_datadir}/pixmaps/P-face.ico
%{_datadir}/applications/pronterface.desktop
%doc README* COPYING
%files -n plater -f plater.lang
-%{_bindir}/plater
+%{_bindir}/plater*
%{python_sitelib}/plater.py*
%{_datadir}/pixmaps/plater.ico
%{_datadir}/applications/plater.desktop
%doc README* COPYING
%changelog
+* Fri Sep 06 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-32.20130711gitb8f549b
+- Fixed #1004973 (%%{name}-missing-plater-import.patch)
+- In F <= 19 added backwards compatibility .py symlinks to bindir
+- Added asterisk at the end of bindir content in %%files to also match those symlinkss
+
* Sun Aug 11 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-31.20130711gitb8f549b
- No longer have .py named scripts in bindir
More information about the scm-commits
mailing list