Hello community, here is the log from the commit of package python-veusz for openSUSE:Factory checked in at 2015-03-09 10:08:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-veusz (Old) and /work/SRC/openSUSE:Factory/.python-veusz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-veusz" Changes: -------- --- /work/SRC/openSUSE:Factory/python-veusz/python-veusz.changes 2014-10-20 07:27:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-veusz.new/python-veusz.changes 2015-03-09 10:08:58.000000000 +0100 @@ -1,0 +2,8 @@ +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 +- Split gui stuff into veusz subpackage per python package naming + guidelines. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-veusz.spec ++++++ --- /var/tmp/diff_new_pack.jjvgIl/_old 2015-03-09 10:08:58.000000000 +0100 +++ /var/tmp/diff_new_pack.jjvgIl/_new 2015-03-09 10:08:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-veusz # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define pyname veusz +%define appname veusz Name: python-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 BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -43,11 +42,12 @@ %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} Requires: python-numpy Requires: python-qt4 -Provides: %{pyname} = %{version} +Recommends: %{appname} +Requires(post): shared-mime-info +Requires(post): desktop-file-utils +Requires(postun): shared-mime-info +Requires(postun): desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(post): shared-mime-info desktop-file-utils -Requires(postun): shared-mime-info desktop-file-utils -%{py_requires} %description Veusz is a scientific plotting package, designed to create @@ -57,8 +57,22 @@ 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} find -name \*~ | xargs rm -f %build @@ -70,33 +84,33 @@ --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 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}%{python_sitearch}/%{pyname}/icons/*.png \ - %{buildroot}%{_datadir}/pixmaps/%{pyname} -mv %{buildroot}%{python_sitearch}/%{pyname}/icons/*.svg \ - %{buildroot}%{_datadir}/pixmaps/%{pyname} -for i in `ls %{buildroot}%{_datadir}/pixmaps/%{pyname}/`; do -ln -s %{_datadir}/pixmaps/%{pyname}/$i \ - %{buildroot}%{python_sitearch}/%{pyname}/icons/$i ; +mkdir -p %{buildroot}%{_datadir}/pixmaps/%{appname} +mv %{buildroot}%{python_sitearch}/veusz/icons/*.png \ + %{buildroot}%{_datadir}/pixmaps/%{appname} +mv %{buildroot}%{python_sitearch}/veusz/icons/*.svg \ + %{buildroot}%{_datadir}/pixmaps/%{appname} +for i in `ls %{buildroot}%{_datadir}/pixmaps/veusz/`; do +ln -s %{_datadir}/pixmaps/%{appname}/$i \ + %{buildroot}%{python_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 @@ -107,10 +121,13 @@ # install man pages mkdir -p %{buildroot}%{_mandir}/man1 -install -p Documents/veusz.1 Documents/veusz_listen.1 -m 0644 \ +install -p Documents/%{appname}.1 Documents/%{appname}_listen.1 -m 0644 \ %{buildroot}%{_mandir}/man1 -install -m0644 COPYING %{buildroot}%{python_sitearch}/%{pyname}/ +install -m0644 COPYING %{buildroot}%{python_sitearch}/veusz/ + +%fdupes -s %{buildroot}%{python_sitearch} +%fdupes %{buildroot}%{_datadir}/pixmaps/%{appname}/ %check # Problems connectiong to xserver for openSUSE 12.2 and below @@ -122,34 +139,38 @@ python tests/runselftest.py %endif -%fdupes -s %{buildroot}%{py_sitedir} -%fdupes %{buildroot}%{_datadir}/pixmaps/%{pyname}/ - %post update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications %icon_theme_cache_post %postun update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -update-desktop-database %{_datadir}/applications %icon_theme_cache_postun +%post -n %{appname} +update-desktop-database %{_datadir}/applications + +%postun -n %{appname} +update-desktop-database %{_datadir}/applications + %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/%{appname}/ %dir %{_datadir}/appdata -%{_datadir}/appdata/%{pyname}.appdata.xml -%{_datadir}/pixmaps/veusz/ -%{python_sitearch}/%{pyname}-%{version}-py%{py_ver}.egg-info -%{python_sitearch}/%{pyname}/ -%{_datadir}/icons/hicolor/*/apps/%{pyname}.* +%{_datadir}/appdata/%{appname}.appdata.xml +%{_datadir}/icons/hicolor/*/apps/%{appname}.* +%{_datadir}/mime/packages/%{appname}.xml +%{python_sitearch}/veusz-%{version}-py*.egg-info +%{python_sitearch}/veusz/ + +%files -n %{appname} +%defattr(-,root,root) +%{_bindir}/%{appname} +%{_bindir}/%{appname}_listen +%{_datadir}/applications/%{appname}.desktop %{_mandir}/man1/* %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
