Hello community, here is the log from the commit of package python3-veusz for openSUSE:Factory checked in at 2015-03-05 15:42:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-veusz (Old) and /work/SRC/openSUSE:Factory/.python3-veusz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-veusz" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-veusz/python3-veusz.changes 2015-01-23 15:47:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-veusz.new/python3-veusz.changes 2015-03-05 18:17:04.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Mar 4 09:43:42 UTC 2015 - [email protected] + +- Correctly use patch + +------------------------------------------------------------------- +Mon Mar 2 12:12:11 UTC 2015 - [email protected] + +- Reorganize files so the python 2 and python 3 versions of the + package do not conflict + * Add veusz-python3-naming.patch, which is part of this +- Split gui stuff into veusz3 subpackage per python package naming + guidelines. + +------------------------------------------------------------------- New: ---- veusz-python3-naming.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-veusz.spec ++++++ --- /var/tmp/diff_new_pack.xXzYfa/_old 2015-03-05 18:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.xXzYfa/_new 2015-03-05 18:17:05.000000000 +0100 @@ -15,19 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define pyname veusz +%define appname veusz3 Name: python3-veusz Version: 1.22 Release: 0 +Summary: Scientific plotting library for Python # The entire source code is GPL-2.0+ except helpers/src/_nc_cntr.c which is Python-2.0 -Summary: GUI scientific plotting package License: GPL-2.0+ and Python-2.0 Group: Productivity/Scientific/Other Url: http://home.gna.org/veusz/ Source0: http://download.gna.org/veusz/veusz-%{version}.tar.gz -Source3: %{pyname}_256.png +Source3: veusz_256.png +# PATCH-FEATURE-OPENSUSE veusz-python3-naming.patch -- Rename so python 2 and 3 versions don't conflict +Patch0: veusz-python3-naming.patch BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -43,12 +44,12 @@ %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} Requires: python3-numpy Requires: python3-qt4 -Provides: %{pyname} = %{version} -Obsoletes: python-veusz < %{version} -Provides: python-veusz = %{version} +Recommends: %{appname} BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): shared-mime-info desktop-file-utils -Requires(postun): shared-mime-info desktop-file-utils +Requires(post): shared-mime-info +Requires(post): desktop-file-utils +Requires(postun): shared-mime-info +Requires(postun): desktop-file-utils %description Veusz is a scientific plotting package, designed to create @@ -58,8 +59,23 @@ plotting functions, data with errors, keys, labels, stacked plots, multiple plots, contours, shapes and fitting data. +%package -n %{appname} +Summary: GUI scientific plotting package +Requires: %{name} = %{version} +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils + +%description -n %{appname} +Veusz is a scientific plotting package, designed to create +publication-ready Postscript/PDF/SVG output. It features GUI, +command-line, and scripting interfaces. Graphs are constructed from +widgets, allowing complex layouts to be designed. Veusz supports +plotting functions, data with errors, keys, labels, stacked plots, +multiple plots, contours, shapes and fitting data. + %prep -%setup -q -n %{pyname}-%{version} +%setup -q -n veusz-%{version} +%patch0 -p1 find -name \*~ | xargs rm -f %build @@ -71,33 +87,34 @@ --root=%{buildroot} # Install .desktop, mime and appdata files from upstream tarball -install -Dm0644 support/%{pyname}.appdata.xml %{buildroot}%{_datadir}/appdata/%{pyname}.appdata.xml -install -Dm0644 support/%{pyname}.xml %{buildroot}/%{_datadir}/mime/packages/%{pyname}.xml +install -Dm0644 support/veusz.appdata.xml %{buildroot}%{_datadir}/appdata/%{appname}.appdata.xml +install -Dm0644 support/veusz.xml %{buildroot}/%{_datadir}/mime/packages/%{appname}.xml +mv support/veusz.desktop support/%{appname}.desktop desktop-file-install -m 0644 \ --dir=%{buildroot}/%{_datadir}/applications/ \ --add-category=2DGraphics \ - support/%{pyname}.desktop + support/%{appname}.desktop # move icon files to /usr/share/pixmaps/veusz -mkdir -p %{buildroot}%{_datadir}/pixmaps/%{pyname} -mv %{buildroot}%{python3_sitearch}/%{pyname}/icons/*.png \ - %{buildroot}%{_datadir}/pixmaps/%{pyname} -mv %{buildroot}%{python3_sitearch}/%{pyname}/icons/*.svg \ - %{buildroot}%{_datadir}/pixmaps/%{pyname} -for i in `ls %{buildroot}%{_datadir}/pixmaps/%{pyname}/`; do -ln -s %{_datadir}/pixmaps/%{pyname}/$i \ - %{buildroot}%{python3_sitearch}/%{pyname}/icons/$i ; +mkdir -p %{buildroot}%{_datadir}/pixmaps/%{appname} +mv %{buildroot}%{python3_sitearch}/veusz/icons/*.png \ + %{buildroot}%{_datadir}/pixmaps/%{appname} +mv %{buildroot}%{python3_sitearch}/veusz/icons/*.svg \ + %{buildroot}%{_datadir}/pixmaps/%{appname} +for i in `ls %{buildroot}%{_datadir}/pixmaps/veusz/`; do +ln -s %{_datadir}/pixmaps/%{appname}/$i \ + %{buildroot}%{python3_sitearch}/veusz/icons/$i ; done # symlink main veusz icon also into hicolor-icon-theme dir (for desktop file) -install -m 0644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{pyname}/veusz_256.png +install -m 0644 %{S:3} %{buildroot}%{_datadir}/pixmaps/%{appname}/veusz_256.png for size in 16 32 48 64 128 256; do odir=%{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps mkdir -p $odir - ln -s %{_datadir}/pixmaps/%{pyname}/veusz_${size}.png ${odir}/veusz.png + ln -s %{_datadir}/pixmaps/%{appname}/veusz_${size}.png ${odir}/%{appname}.png done odir=%{buildroot}%{_datadir}/icons/hicolor/scalable/apps mkdir -p $odir -ln -s %{_datadir}/pixmaps/%{pyname}/veusz.svg $odir +ln -s %{_datadir}/pixmaps/%{appname}/veusz.svg $odir/%{appname}.svg # Mark some scripts as executable. # This isn't really needed, but Veusz includes shebangs in scripts @@ -108,10 +125,18 @@ # install man pages mkdir -p %{buildroot}%{_mandir}/man1 -install -p Documents/veusz.1 Documents/veusz_listen.1 -m 0644 \ +mv Documents/veusz.1 Documents/%{appname}.1 +mv Documents/veusz_listen.1 Documents/%{appname}_listen.1 +install -p Documents/%{appname}.1 Documents/%{appname}_listen.1 -m 0644 \ %{buildroot}%{_mandir}/man1 -install -m0644 COPYING %{buildroot}%{python3_sitearch}/%{pyname}/ +install -m0644 COPYING %{buildroot}%{python3_sitearch}/veusz/ + +mv %{buildroot}%{_bindir}/veusz %{buildroot}%{_bindir}/%{appname} +mv %{buildroot}%{_bindir}/veusz_listen %{buildroot}%{_bindir}/%{appname}_listen + +%fdupes -s %{buildroot}%{python3_sitearch} +%fdupes %{buildroot}%{_datadir}/pixmaps/%{appname}/ %check export DISPLAY=%{X_display} @@ -120,34 +145,39 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} \ python3 tests/runselftest.py -%fdupes -s %{buildroot}%{python3_sitearch} -%fdupes %{buildroot}%{_datadir}/pixmaps/%{pyname}/ - %post update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications -%icon_theme_cache_post +%icon_theme_cache_postun %postun update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : +%icon_theme_cache_post + +%post -n %{appname} +update-desktop-database %{_datadir}/applications + +%postun -n %{appname} update-desktop-database %{_datadir}/applications -%icon_theme_cache_postun %files %defattr(-,root,root) %doc README AUTHORS COPYING ChangeLog %doc Documents/manual.html %doc Documents/manimages/ -%{_bindir}/veusz -%{_bindir}/veusz_listen -%{_datadir}/applications/%{pyname}.desktop -%{_datadir}/mime/packages/%{pyname}.xml -%{_datadir}/pixmaps/veusz/ +%{_datadir}/pixmaps/%{appname}/ %dir %{_datadir}/appdata -%{_datadir}/appdata/%{pyname}.appdata.xml -%{python3_sitearch}/%{pyname}-%{version}-py%{py3_ver}.egg-info -%{python3_sitearch}/%{pyname}/ -%{_datadir}/icons/hicolor/*/apps/%{pyname}.* +%{_datadir}/appdata/%{appname}.appdata.xml +%{_datadir}/icons/hicolor/*/apps/%{appname}.* +%{_datadir}/mime/packages/%{appname}.xml +%{python3_sitearch}/veusz-%{version}-py*.egg-info +%{python3_sitearch}/veusz/ + +%files -n %{appname} +%defattr(-,root,root) +%{_bindir}/%{appname} +%{_bindir}/%{appname}_listen +%{_datadir}/applications/%{appname}.desktop %{_mandir}/man1/* + %changelog ++++++ veusz-python3-naming.patch ++++++ From: [email protected] Date: 2015-03-02 13:10:00 +0000 Subject: Rename files so python 2 and 3 versions don't conflict Upstream: openSUSE-specific This renames some files so that the python 2 and python 3 versions of the package can both be installed without conflicting. diff -U 3 -H -d -r -N -x '*.pickle' -x '*~' -x '*.orig' -- a/support/veusz.appdata.xml b/support/veusz.appdata.xml --- a/support/veusz.appdata.xml 2014-02-01 18:09:03.000000000 +0100 +++ b/support/veusz.appdata.xml 2015-03-02 13:05:02.918741168 +0100 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2014 Jeremy Sanders <[email protected]> --> <application> - <id type="desktop">veusz.desktop</id> + <id type="desktop">veusz3.desktop</id> <licence>CC0</licence> - <name>Veusz</name> + <name>Veusz3</name> <summary>Scientific plotting package</summary> <description> <p> @@ -13,8 +13,8 @@ also supported. Data can be read from text, CSV, HDF5 or FITS files. In addition, you can also enter, manipulate or examine data from within the application. The program also provides a - command line and scripting interface (based on Python) to its - plotting facilities. It can also act as a Python plotting + command line and scripting interface (based on Python 3) to its + plotting facilities. It can also act as a Python 3 plotting module. </p> <p> diff -U 3 -H -d -r -N -x '*.pickle' -x '*~' -x '*.orig' -- a/support/veusz.desktop b/support/veusz.desktop --- a/support/veusz.desktop 2014-08-23 17:15:18.000000000 +0200 +++ b/support/veusz.desktop 2015-03-02 13:05:48.407013937 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 -Name=Veusz +Name=Veusz3 GenericName=Scientific plotting Comment=Scientific plotting and graphing package -MimeType=application/x-veusz; -Exec=veusz %F -Icon=veusz +MimeType=application/x-veusz3; +Exec=veusz3 %F +Icon=veusz3 Terminal=false Type=Application Categories=DataVisualization;Science; diff -U 3 -H -d -r -N -x '*.pickle' -x '*~' -x '*.orig' -- a/support/veusz.xml b/support/veusz.xml --- a/support/veusz.xml 2014-04-27 15:02:31.000000000 +0200 +++ b/support/veusz.xml 2015-03-02 13:06:03.109778906 +0100 @@ -1,12 +1,12 @@ <?xml version='1.0'?> -<!-- Shared MIME database XML file for Veusz --> +<!-- Shared MIME database XML file for Veusz3 --> <mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/x-veusz"> - <comment>Veusz saved document</comment> + <mime-type type="application/x-veusz3"> + <comment>Veusz3 saved document</comment> <glob pattern="*.vsz"/> <glob pattern="*.vszh5"/> <magic priority="50"> - <match type="string" value="# Veusz saved document" offset="0"/> + <match type="string" value="# Veusz3 saved document" offset="0"/> </magic> </mime-type> </mime-info> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
