Hello community, here is the log from the commit of package Printrun for openSUSE:Factory checked in at 2018-07-22 23:04:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Printrun (Old) and /work/SRC/openSUSE:Factory/.Printrun.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Printrun" Sun Jul 22 23:04:23 2018 rev:2 rq:624274 version:2.0.0~rc5.1522069560.e0ee40a Changes: -------- --- /work/SRC/openSUSE:Factory/Printrun/Printrun.changes 2017-08-10 14:11:11.640133848 +0200 +++ /work/SRC/openSUSE:Factory/.Printrun.new/Printrun.changes 2018-07-22 23:04:24.316926845 +0200 @@ -1,0 +2,15 @@ +Tue Jul 17 23:01:00 UTC 2018 - [email protected] + +- Spec file fixes/cleanup: + * Use python3, python2 is no longer supported by Printrun + * Add missing setuptools dependency + * Remove %defattr + * Tag COPYING with %license, and only package it in common subpackage +- Drop obsolete Printrun-pyglet12.patch + +------------------------------------------------------------------- +Tue Apr 10 12:21:09 UTC 2018 - [email protected] + +- update to 2.0.0rc5 + +------------------------------------------------------------------- Old: ---- Printrun-20170720~pre.1494969671.f54b6f9.obscpio Printrun-pyglet12.patch New: ---- Printrun-2.0.0~rc5.1522069560.e0ee40a.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Printrun.spec ++++++ --- /var/tmp/diff_new_pack.NzaDBC/_old 2018-07-22 23:04:25.140926540 +0200 +++ /var/tmp/diff_new_pack.NzaDBC/_new 2018-07-22 23:04:25.144926539 +0200 @@ -1,7 +1,7 @@ # -# spec file for package printrun +# spec file for package Printrun # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,10 +17,10 @@ Name: Printrun -Version: 20170720~pre.1494969671.f54b6f9 +Version: 2.0.0~rc5.1522069560.e0ee40a Release: 0 Summary: RepRap printer interface and tools -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Graphics/Convertors Url: https://github.com/kliment/Printrun Source0: Printrun-%{version}.tar.xz @@ -30,23 +30,19 @@ Source2: pronterface.desktop Source3: plater.desktop -Patch0: %{name}-pyglet12.patch - -BuildRequires: python-Cython -BuildRequires: python-devel -BuildRequires: python-pyserial +BuildRequires: gettext +BuildRequires: python3-Cython +BuildRequires: python3-devel +BuildRequires: python3-pyserial +BuildRequires: python3-setuptools %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: update-desktop-files -#BuildConflicts: post-build-checks -BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif - %if 0%{?fedora_version} BuildRequires: desktop-file-utils %endif -BuildRequires: gettext Requires: plater = %{version}-%{release} Requires: pronsole = %{version}-%{release} Requires: pronterface = %{version}-%{release} @@ -63,9 +59,9 @@ %package common Summary: Common files for Printrun Group: Productivity/Graphics/Convertors -Requires: python-numpy -Requires: python-pyglet -Requires: python-pyserial +Requires: python3-numpy +Requires: python3-pyglet +Requires: python3-pyserial %description common Printrun is a set of G-code sending applications for RepRap. @@ -77,6 +73,7 @@ Summary: CLI interface for RepRap Group: Productivity/Graphics/Convertors Requires: %{name}-common = %{version}-%{release} +BuildArch: noarch %description -n pronsole Pronsole is a featured command line G-code sender. @@ -90,6 +87,7 @@ Group: Productivity/Graphics/Convertors Requires: pronsole = %{version}-%{release} Requires: wxPython +BuildArch: noarch %description -n pronterface Pronterface is a featured G-code sender with graphical user interface. @@ -103,6 +101,7 @@ Group: Productivity/Graphics/Convertors Requires: %{name}-common = %{version}-%{release} Requires: wxPython +BuildArch: noarch %description -n plater Plater is a GUI tool to prepare printing plate from STL files for ReRap. @@ -113,14 +112,16 @@ %prep %setup -q -#%patch0 -p1 # use launchers for skeinforge sed -i 's|python skeinforge/skeinforge_application/skeinforge.py|skeinforge|' pronsole.py sed -i 's|python skeinforge/skeinforge_application/skeinforge_utilities/skeinforge_craft.py|skeinforge-craft|' pronsole.py +# fixup shebangs, /usr/bin/env python3 -> python3, and executable bits +sed -s -i -e '1 s@/usr/bin/env python3@/usr/bin/python3@' printrun/*py + %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" python3 setup.py build # rebuild locales cd locale @@ -134,16 +135,17 @@ DESTDIR=%{buildroot} # python => 2.5 expects this to exist (it will exist if the package # installs something there, but we don't) otherwise fails for SLE_11 -mkdir -p %{buildroot}/%{python_sitelib} +mkdir -p %{buildroot}/%{python3_sitearch} install -dpm 0755 %buildroot/{%_bindir,%_datadir/pixmaps,%_datadir/applications,%_datadir/%progname,%_defaultdocdir/progname} -%{__python} setup.py install --skip-build --prefix %{buildroot}%{_prefix} +python3 setup.py install --skip-build --prefix %{buildroot}%{_prefix} -test -d "%{buildroot}%{python_sitelib}" && find "%{buildroot}%{python_sitelib}/" -name '*.pyc' -exec %__rm {} \; +# fixup executable bits +for f in %{buildroot}%{python3_sitearch}/printrun/*py; do + sed -e '/\/usr\/bin\/python3/ Q 1 ; Q 0' $f || chmod 0755 $f +done # desktop files -# via home:dbruce > tuxmath_test > tuxmath.spec -# via openSUSE:12.2 > nagstamon > nagstamon.spec %if 0%{?suse_version} mkdir -p "%buildroot/%_docdir/%name" mkdir -p %{buildroot}%{_datadir}/applications @@ -154,7 +156,7 @@ %suse_update_desktop_file -i %{buildroot}/%{_datadir}/applications/pronsole.desktop %suse_update_desktop_file -i %{buildroot}/%{_datadir}/applications/pronterface.desktop %suse_update_desktop_file -i %{buildroot}/%{_datadir}/applications/plater.desktop -#%%fdupes -s %%buildroot +%fdupes -s %{buildroot}%{python3_sitearch}/ %endif %if 0%{?fedora_version} @@ -169,49 +171,39 @@ 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}/printrun -#chmod +x gcview.py graph.py stlview.py SkeinforgeQuickEditDialog.py calibrateextruder.py webinterface.py -#cd - - %{find_lang} pronterface %{find_lang} plater %files -%defattr(-,root,root,0755) -#%%{python_sitelib}/* -%doc README* COPYING +%doc README* +%license COPYING %files common -%defattr(-,root,root,0755) -%{_libdir}/python*/site-packages/* +%doc README* +%license COPYING +%{python3_sitearch}/* %{_bindir}/printcore.* -%doc README* COPYING %files -n pronsole -%defattr(-,root,root,0755) %{_bindir}/pronsole.* -#%{_bindir}/gcoder.* %{_datadir}/pixmaps/pronsole.png %{_datadir}/applications/pronsole.desktop -%{_datadir}/appdata/pronsole.appdata.xml -%doc README* COPYING +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/pronsole.appdata.xml %files -n pronterface -f pronterface.lang -%defattr(-,root,root,0755) %{_bindir}/pronterface.* %{_datadir}/pronterface %{_datadir}/pixmaps/pronterface.png -%{_datadir}/appdata/pronterface.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/pronterface.appdata.xml %{_datadir}/applications/pronterface.desktop -%doc README* COPYING %files -n plater -f plater.lang -%defattr(-,root,root,0755) %{_bindir}/plater.* %{_datadir}/pixmaps/plater.png %{_datadir}/applications/plater.desktop -%{_datadir}/appdata/plater.appdata.xml -%doc README* COPYING +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/plater.appdata.xml %changelog ++++++ Printrun.obsinfo ++++++ --- /var/tmp/diff_new_pack.NzaDBC/_old 2018-07-22 23:04:25.168926530 +0200 +++ /var/tmp/diff_new_pack.NzaDBC/_new 2018-07-22 23:04:25.172926528 +0200 @@ -1,5 +1,5 @@ name: Printrun -version: 20170720~pre.1494969671.f54b6f9 -mtime: 1494969671 -commit: f54b6f92e4a69f0393cd060f2d401e784246cafd +version: 2.0.0~rc5.1522069560.e0ee40a +mtime: 1522069560 +commit: e0ee40a1d8c271644d15b164031c65b2cf20ac6f ++++++ _service ++++++ --- /var/tmp/diff_new_pack.NzaDBC/_old 2018-07-22 23:04:25.184926524 +0200 +++ /var/tmp/diff_new_pack.NzaDBC/_new 2018-07-22 23:04:25.184926524 +0200 @@ -2,7 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/kliment/Printrun.git</param> <param name="scm">git</param> - <param name="versionprefix">20170720~pre</param> + <param name="revision">printrun-2.0.0rc5</param> + <param name="versionprefix">2.0.0~rc5</param> </service> <service mode="disabled" name="set_version" />
