Hello community, here is the log from the commit of package nitroshare for openSUSE:Factory checked in at 2016-08-11 18:53:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nitroshare (Old) and /work/SRC/openSUSE:Factory/.nitroshare.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nitroshare" Changes: -------- --- /work/SRC/openSUSE:Factory/nitroshare/nitroshare.changes 2016-07-14 09:49:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nitroshare.new/nitroshare.changes 2016-08-11 18:53:29.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Jul 18 06:42:46 UTC 2016 - jeng...@inai.de + +- Trim filelist. + +------------------------------------------------------------------- +Thu Jul 14 18:23:12 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 0.3.3: + * Extensions for Caja & Nemo. + * Fix a bug that broke progress and status display. + * Fix a number of DPI issues. + * Add French, Korean, & Spanish translations. +- Add nitroshare-fix-caja.patch: use a correct Caja GI API version. + +------------------------------------------------------------------- Old: ---- nitroshare-0.3.2.tar.gz nitroshare-0.3.2.tar.gz.asc New: ---- nitroshare-0.3.3.tar.gz nitroshare-0.3.3.tar.gz.asc nitroshare-fix-caja.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nitroshare.spec ++++++ --- /var/tmp/diff_new_pack.CYzLd6/_old 2016-08-11 18:53:30.000000000 +0200 +++ /var/tmp/diff_new_pack.CYzLd6/_new 2016-08-11 18:53:30.000000000 +0200 @@ -18,7 +18,7 @@ %define _version 0.3 Name: nitroshare -Version: 0.3.2 +Version: 0.3.3 Release: 0 Summary: Network file transfer application License: MIT @@ -27,6 +27,8 @@ Source: https://launchpad.net/%{name}/%{_version}/%{version}/+download/%{name}-%{version}.tar.gz Source1: https://launchpad.net/%{name}/%{_version}/%{version}/+download/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring +# PATCH-FIX-UPSTREAM nitroshare-fix-caja.patch sor.ale...@meowr.ru -- Use a correct Caja GI API version. +Patch0: %{name}-fix-caja.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel @@ -51,6 +53,20 @@ * Simple and intuitive user interface. * Transfer entire directories. +%package -n caja-extension-%{name} +Summary: NitroShare integrated into Caja +Group: Productivity/File utilities +Requires: %{name} = %{version} +Requires: caja +Requires: python-caja +Supplements: packageand(caja:%{name}) + +%description -n caja-extension-%{name} +A cross-platform network file transfer application designed to make +transferring any file to any device as painless as possible. + +This package integrates NitroShare seamlessly into Caja. + %package -n nautilus-extension-%{name} Summary: NitroShare integrated into Nautilus Group: Productivity/File utilities @@ -65,8 +81,25 @@ This package integrates NitroShare seamlessly into Nautilus. +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%package -n nemo-extension-%{name} +Summary: NitroShare integrated into Nemo +Group: Productivity/File utilities +Requires: %{name} = %{version} +Requires: nemo +Requires: python-nemo +Supplements: packageand(nemo:%{name}) + +%description -n nemo-extension-%{name} +A cross-platform network file transfer application designed to make +transferring any file to any device as painless as possible. + +This package integrates NitroShare seamlessly into Nemo. +%endif + %prep %setup -q +%patch0 -p1 %build %cmake @@ -76,6 +109,10 @@ %cmake_install %suse_update_desktop_file -r %{name} Network FileTransfer +%if 0%{?suse_version} <= 1320 && !(0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +rm -rf %{buildroot}%{_datadir}/nemo-python/ +%endif + %post %desktop_database_post %icon_theme_cache_post @@ -89,23 +126,24 @@ %doc LICENSE.txt README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%dir %{_datadir}/icons/breeze*/ -%dir %{_datadir}/icons/breeze*/apps/ -%dir %{_datadir}/icons/breeze*/apps/*/ -%dir %{_datadir}/icons/gnome/ -%dir %{_datadir}/icons/gnome/*/ -%dir %{_datadir}/icons/gnome/*/apps/ -%dir %{_datadir}/icons/ubuntu-mono-*/ -%dir %{_datadir}/icons/ubuntu-mono-*/apps/ -%dir %{_datadir}/icons/ubuntu-mono-*/apps/*/ -%{_datadir}/icons/*/*/*/%{name}* +%{_datadir}/icons/* %{_mandir}/man?/%{name}.?%{?ext_man} +%files -n caja-extension-%{name} +%defattr(-,root,root) +%doc LICENSE.txt +%{_datadir}/caja-python/ + %files -n nautilus-extension-%{name} %defattr(-,root,root) %doc LICENSE.txt -%dir %{_datadir}/nautilus-python/ -%dir %{_datadir}/nautilus-python/extensions/ -%{_datadir}/nautilus-python/extensions/%{name}.py +%{_datadir}/nautilus-python/ + +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120200 && 0%{?is_opensuse}) +%files -n nemo-extension-%{name} +%defattr(-,root,root) +%doc LICENSE.txt +%{_datadir}/nemo-python/ +%endif %changelog ++++++ nitroshare-0.3.2.tar.gz -> nitroshare-0.3.3.tar.gz ++++++ ++++ 2635 lines of diff (skipped) ++++++ nitroshare-fix-caja.patch ++++++ --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -239,6 +239,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") # Configure and install Python extensions for Nautilus-derived file managers foreach(_file_manager Nautilus Nemo Caja) + if(${_file_manager} MATCHES "Caja") + set(_file_manager_ver "2.0") + else() + set(_file_manager_ver "3.0") + endif() string(TOLOWER ${_file_manager} _file_manager_lower) set(_py_filename "${CMAKE_CURRENT_BINARY_DIR}/dist/nitroshare_${_file_manager_lower}.py") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/dist/nitroshare.py.in" "${_py_filename}") --- a/src/dist/nitroshare.py.in +++ b/src/dist/nitroshare.py.in @@ -32,7 +32,7 @@ from urlparse import urlparse import gi gi.require_version('Gtk', '3.0') -gi.require_version('${_file_manager}', '3.0') +gi.require_version('${_file_manager}', '${_file_manager_ver}') from gi.repository import ${_file_manager}, GObject, Gtk from requests import ConnectionError, post
