Hello community, here is the log from the commit of package caffeine for openSUSE:Factory checked in at 2016-08-12 15:43:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caffeine (Old) and /work/SRC/openSUSE:Factory/.caffeine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caffeine" Changes: -------- --- /work/SRC/openSUSE:Factory/caffeine/caffeine.changes 2014-12-30 00:50:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.caffeine.new/caffeine.changes 2016-08-12 15:43:24.000000000 +0200 @@ -1,0 +2,31 @@ +Mon Jul 11 11:19:24 UTC 2016 - [email protected] + +- Only filter out AppIndicator dependency on SLE - all versions of + openSUSE where caffeine builds for have libappindicator + available. + +------------------------------------------------------------------- +Sun Nov 1 13:56:18 UTC 2015 - [email protected] + +- Update to version 2.8.3 + + No changelog for this version +- Changes from version 2.8.2 + + Fixes some minor bugs in 2.8. + + Fix a major bug inadvertently introduced in the short-lived + 2.8.1 (caffeine-indicator was broken). +- Changes from version 2.8 + + Restores widely-missed functionality removed in Caffeine 2.7: + namely the ability to inhibit desktop idleness manually, + (via the new caffeine-indicator) and the ability to inhibit + desktop idleness for the duration of a particular command + (via the new command 'caffeinate'). It should also work in most + desktop environments again (Caffeine 2.7 worked in only a few). +- Replace python-devel BuildRequires with python3-devel: follow + upstreams port to python3 +- Changed dependencies: + + python3-xdg in place of python-xdg + + python3-xlib in place of python-xlib +- Rebase + caffeine-fix-desktop-file-semicolon-trailing-character.patch. + +------------------------------------------------------------------- Old: ---- caffeine_2.7.2.tar.gz New: ---- caffeine_2.8.3.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caffeine.spec ++++++ --- /var/tmp/diff_new_pack.wElIEh/_old 2016-08-12 15:43:25.000000000 +0200 +++ /var/tmp/diff_new_pack.wElIEh/_new 2016-08-12 15:43:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package caffeine # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Malcolm J Lewis <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -17,26 +17,28 @@ # +%if %{suse_version} == 1315 && ! 0%{?is_opensuse} %define __requires_exclude typelib\\(AppIndicator3\\) +%endif Name: caffeine -Version: 2.7.2 +Version: 2.8.3 Release: 0 Summary: Utility to inhibit screensaver and sleep modes License: GPL-3.0+ and LGPL-3.0+ Group: System/GUI/GNOME Url: https://launchpad.net/caffeine -Source0: https://launchpad.net/~caffeine-developers/+archive/ubuntu/ppa/+files/%{name}_%{version}.tar.gz +Source0: https://launchpad.net/ubuntu/+archive/primary/+files/%{name}_%{version}.orig.tar.gz # PATCH-FIX-UPSTREAM caffeine-fix-desktop-file-semicolon-trailing-character [email protected] -- Fix missing semicolon in Keywords entries. Patch1: caffeine-fix-desktop-file-semicolon-trailing-character.patch BuildRequires: fdupes # For typelib() Requires BuildRequires: gobject-introspection BuildRequires: hicolor-icon-theme -BuildRequires: python-devel +BuildRequires: python3-devel BuildRequires: update-desktop-files -Requires: python-xdg -Requires: python-xlib +Requires: python3-xdg +Requires: python3-xlib Provides: %{name}-lang = %{version} Obsoletes: %{name}-lang < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -51,12 +53,15 @@ %patch1 -p1 %build -python setup.py build +python3 setup.py build %install -python setup.py install -O1 --prefix=%{_prefix} --root=%{buildroot} -%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop -%fdupes %{buildroot} +python3 setup.py install -O1 --prefix=%{_prefix} --root=%{buildroot} +%suse_update_desktop_file -G Caffeine -r -u %{buildroot}%{_datadir}/applications/caffeine.desktop Utility TrayIcon +%suse_update_desktop_file -G Caffeine -r -u %{buildroot}%{_sysconfdir}/xdg/autostart/%{name}.desktop Utility TrayIcon +%find_lang %{name}-indicator +# Remove ubuntu icons for now +rm -rf %{buildroot}%{_datadir}/icons/ubuntu-mono-dark %post %desktop_database_post @@ -66,16 +71,18 @@ %desktop_database_postun %icon_theme_cache_postun -%files +%files -f %{name}-indicator.lang %defattr(-,root,root) %doc COPYING COPYING.LESSER README -%{_bindir}/caffeine -%{python_sitelib}/ewmh* -%{python_sitelib}/caffeine-%{version}-py%{py_ver}.egg-info -%{_datadir}/applications/caffeine.desktop -%{_datadir}/icons/hicolor/*/apps/caffeine.* -%{_datadir}/pixmaps/caffeine.png -%{_mandir}/man1/caffeine.1%{?ext_man} -%{_sysconfdir}/xdg/autostart/%{name}.desktop +%{_bindir}/caffein* +%{python3_sitelib}/ewmh* +%{python3_sitelib}/__pycache__/ewmh* +%{python3_sitelib}/caffeine-%{version}-py%{py3_ver}.egg-info +%{_datadir}/caffeine-indicator +%{_datadir}/applications/caffeine*.desktop +%{_datadir}/icons/*/*/*/caffeine* +%{_datadir}/pixmaps/caffeine.* +%{_mandir}/man?/caffein*%{?ext_man} +%{_sysconfdir}/xdg/autostart/caffeine.desktop %changelog ++++++ caffeine-fix-desktop-file-semicolon-trailing-character.patch ++++++ --- /var/tmp/diff_new_pack.wElIEh/_old 2016-08-12 15:43:25.000000000 +0200 +++ /var/tmp/diff_new_pack.wElIEh/_new 2016-08-12 15:43:25.000000000 +0200 @@ -1,10 +1,9 @@ --- a/share/applications/caffeine.desktop.orig 2014-01-31 00:24:20.000000000 +0100 +++ b/share/applications/caffeine.desktop 2014-12-25 15:42:07.322502449 +0100 -@@ -6,6 +6,6 @@ +@@ -25,5 +25,5 @@ Terminal=false Type=Application - Categories=Utility;TrayIcon; + Categories=Utility; -Keywords=Screensaver,Power,Saving,Blank +Keywords=Screensaver,Power,Saving,Blank; - OnlyShowIn=GNOME;Unity; StartupNotify=false
