Hello community, here is the log from the commit of package caffeine for openSUSE:Factory checked in at 2012-02-17 12:19:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caffeine (Old) and /work/SRC/openSUSE:Factory/.caffeine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caffeine", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/caffeine/caffeine.changes 2012-01-17 16:04:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.caffeine.new/caffeine.changes 2012-02-17 12:19:46.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Feb 14 03:53:36 UTC 2012 - [email protected] + +- Add caffeine-fix-desktop-categories.patch: Fix categories string + and missing semi-colon (lp#931874). +- Add caffeine-fix-non-executable-script.patch: Fix + non-executable-script warnings (lp#931875). + +------------------------------------------------------------------- New: ---- caffeine-fix-desktop-categories.patch caffeine-fix-non-executable-script.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caffeine.spec ++++++ --- /var/tmp/diff_new_pack.gdcdLU/_old 2012-02-17 12:19:50.000000000 +0100 +++ /var/tmp/diff_new_pack.gdcdLU/_new 2012-02-17 12:19:50.000000000 +0100 @@ -1,6 +1,7 @@ # # spec file for package caffeine # +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Malcolm J Lewis <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -15,18 +16,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define __requires_exclude typelib\\(AppIndicator3\\) Name: caffeine Version: 2.4.1+419 Release: 0 -License: GPL-3.0+ ; LGPL-3.0+ Summary: Utility to inhibit screensaver and sleep modes -Url: https://launchpad.net/caffeine +License: GPL-3.0+ ; LGPL-3.0+ Group: System/GUI/GNOME +Url: https://launchpad.net/caffeine Source0: http://launchpad.net/caffeine/2.4/2.4.1/+download/caffeine_2.4.1+419~oneiric1.tar.gz -# PATCH-FIX-UPSTREAM caffeine-add-indicator-menu.patch lp892663 [email protected] -- Adds the menu via right-click on indicator +# PATCH-FIX-UPSTREAM caffeine-add-indicator-menu.patch lp#892663 [email protected] -- Adds the menu via right-click on indicator Patch0: caffeine-add-indicator-menu.patch +# PATCH-FIX-UPSTREAM caffeine-fix-desktop-categories.patch lp#931874 [email protected] -- Fix categories string and missing semi-colon. +Patch1: caffeine-fix-desktop-categories.patch +# PATCH-FIX-UPSTREAM caffeine-fix-non-executable-script.patch lp#931875 [email protected] -- Fix non-executable-script warnings. +Patch2: caffeine-fix-non-executable-script.patch BuildRequires: fdupes # For %%glib2_gsettings_schema_* macros BuildRequires: glib2-devel @@ -50,6 +56,8 @@ %prep %setup -q -n recipe-%{version} %patch0 +%patch1 -p1 +%patch2 -p1 %build python setup.py build @@ -60,7 +68,7 @@ %suse_update_desktop_file %{name}-preferences # we don't need ubuntu themes rm -r %{buildroot}%{_datadir}/icons/ubuntu* -%find_lang %{name} +%find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} %post ++++++ caffeine-fix-desktop-categories.patch ++++++ diff -Naur a/share/applications/caffeine.desktop b/share/applications/caffeine.desktop --- a/share/applications/caffeine.desktop 2011-11-11 13:35:24.000000000 -0600 +++ b/share/applications/caffeine.desktop 2012-02-13 21:14:50.263589577 -0600 @@ -6,5 +6,5 @@ Exec=/usr/bin/caffeine Terminal=false Type=Application -Categories=Utility; +Categories=Utility;DesktopUtility; StartupNotify=false diff -Naur a/share/applications/caffeine-preferences.desktop b/share/applications/caffeine-preferences.desktop --- a/share/applications/caffeine-preferences.desktop 2011-11-11 13:35:24.000000000 -0600 +++ b/share/applications/caffeine-preferences.desktop 2012-02-13 21:22:23.038077555 -0600 @@ -6,5 +6,5 @@ Exec=/usr/bin/caffeine -p Terminal=false Type=Application -Categories=Settings;DesktopSettings +Categories=Settings;DesktopSettings; StartupNotify=false ++++++ caffeine-fix-non-executable-script.patch ++++++ diff -Naur a/caffeine/applicationinstance.py b/caffeine/applicationinstance.py --- a/caffeine/applicationinstance.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/applicationinstance.py 2012-02-13 21:28:20.643134426 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright © 2009 The Caffeine Developers diff -Naur a/caffeine/core.py b/caffeine/core.py --- a/caffeine/core.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/core.py 2012-02-13 21:28:20.671134823 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright © 2009 The Caffeine Developers diff -Naur a/caffeine/flash_detect.py b/caffeine/flash_detect.py --- a/caffeine/flash_detect.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/flash_detect.py 2012-02-13 21:28:20.651134539 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python import kaa.metadata import commands diff -Naur a/caffeine/__init__.py b/caffeine/__init__.py --- a/caffeine/__init__.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/__init__.py 2012-02-13 21:28:20.679134937 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright © 2009 The Caffeine Developers diff -Naur a/caffeine/main.py b/caffeine/main.py --- a/caffeine/main.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/main.py 2012-02-13 21:28:20.627134199 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright © 2009 The Caffeine Developers diff -Naur a/caffeine/procmanager.py b/caffeine/procmanager.py --- a/caffeine/procmanager.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/procmanager.py 2012-02-13 21:28:20.635134312 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright © 2009 The Caffeine Developers diff -Naur a/caffeine/utils.py b/caffeine/utils.py --- a/caffeine/utils.py 2011-11-11 13:35:24.000000000 -0600 +++ b/caffeine/utils.py 2012-02-13 21:28:20.659134653 -0600 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: utf-8 -*- # # Copyright © 2009 The Caffeine Developers -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
