diff --git a/.gitignore b/.gitignore index 3d3dda7..c90d66d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -serpentine-0.9.tar.bz2 +serpentine-0.7.tar.bz2 diff --git a/dead.package b/dead.package deleted file mode 100644 index 3c1b5b3..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Dead upstream diff --git a/serpentine-0.9-plugususpend.patch b/serpentine-0.9-plugususpend.patch deleted file mode 100644 index dc5fa71..0000000 --- a/serpentine-0.9-plugususpend.patch +++ /dev/null @@ -1,71 +0,0 @@ -# Bazaar revision bundle v0.9 -# -# message: -# Added support for both versions of suspend. -# committer: Tiago Cogumbreiro -# date: Mon 2007-10-15 11:28:07.520999908 +0100 - -=== modified file serpentine/plugins/plugsuspend.py ---- serpentine/plugins/plugsuspend.py -+++ serpentine/plugins/plugsuspend.py -@@ -22,21 +22,41 @@ - from gettext import gettext as _ - - -+GNOME = dict(object_name='org.gnome.PowerManager', -+ object_path='/org/gnome/PowerManager', -+ interface='org.gnome.PowerManager') -+ -+FDO = dict(object_name='org.freedesktop.PowerManagement', -+ object_path='/org/freedesktop/PowerManagement/Inhibit', -+ interface='org.freedesktop.PowerManagement.Inhibit') -+ -+SPECS = (GNOME, FDO) -+ - class InhibitSuspend(object): - """ - Plugin to enable power inhibiting while writing an audio disc. - """ - def __init__(self): -- self.bus = dbus.Bus(dbus.Bus.TYPE_SESSION) -- self.devobj = self.bus.get_object('org.gnome.PowerManager', -- '/org/gnome/PowerManager') -- self.dev = dbus.Interface(self.devobj, "org.gnome.PowerManager") -+ bus = dbus.Bus(dbus.Bus.TYPE_SESSION) -+ for spec in SPECS: -+ try: -+ obj = bus.get_object(spec['object_name'], -+ spec['object_path']) -+ iface = dbus.Interface(obj, spec['interface']) -+ self.inhibit = iface.Inhibit -+ self.uninhibit = iface.UnInhibit -+ break -+ except dbus.DBusException: -+ pass -+ else: -+ self.inhibit = lambda *args: None -+ self.uninhibit = self.inhibit - - def on_writing_started(self, app): -- self.cookie = self.dev.Inhibit('Serpentine', _('Writing audio disc')) -+ self.cookie = self.inhibit('Serpentine', _('Writing audio disc')) - - def on_writing_finished(self, app): -- self.dev.UnInhibit(self.cookie) -+ self.uninhibit(self.cookie) - - - def create_plugin(app): - -=== modified directory // last-changed:cogumbreiro@users.sf.net-20071015102807 -... -w47ghpg1oib23jd6 -# revision id: cogumbreiro@users.sf.net-20071015102807-w47ghpg1oib23jd6 -# sha1: 5c39d65282cb23d3ddc4b4945fd259d57acb83b3 -# inventory sha1: 007fb3a99364744cf055634a14df39bbd656d3bf -# parent ids: -# cogumbreiro@users.sf.net-20070901174703-ttnzwt3i7rpq24ag -# base id: cogumbreiro@users.sf.net-20070901174703-ttnzwt3i7rpq24ag -# properties: -# branch-nick: serpentine.dev - - diff --git a/serpentine.spec b/serpentine.spec index 1c0fd3d..03f8a93 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -1,16 +1,14 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: serpentine -Version: 0.9 +Version: 0.7 Release: 5%{?dist} Summary: Audio CD Burner Group: Applications/Multimedia -License: GPLv2+ -URL: http://www.irrepupavel.com/projects/serpentine/ +License: GPL +URL: http://s1x.homelinux.net/projects/serpentine Source0: http://download.berlios.de/serpentine/serpentine-%{version}.tar.bz2 -Patch0: %{name}-%{version}-plugususpend.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -20,7 +18,6 @@ BuildRequires: desktop-file-utils, gettext Requires: gstreamer-python, gnome-python2-nautilus-cd-burner Requires: gnome-python2-totem, gnome-python2-gnomevfs, gnome-python2-gconf -Requires: PyXML Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -33,7 +30,6 @@ from applications like Nautilus, Rhythmbox and even Firefox. %prep %setup -q -%patch0 -p0 sed -i 's!Terminal=False!Terminal=false!' data/serpentine.desktop.in %build @@ -79,23 +75,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Jul 26 2009 Fedora Release Engineering - 0.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Nov 29 2008 Ignacio Vazquez-Abrams - 0.9-3 -- Rebuild for Python 2.6 - -* Tue Nov 22 2007 Sindre Pedersen Bjørdal - 0.9-1 -- New release -- Add missing PyXML dependency -- Update License tag -- Update Homepage link -* Sat Dec 23 2006 Jason L Tibbitts III - 0.7-6%{?dist} -- Rebuild with Python 2.5 - * Mon Sep 11 2006 Sindre Pedersen Bjørdal - 0.7-5 - Add missing perl-XML-Parser dependency to fix build diff --git a/sources b/sources index d5f3b5e..d955acc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12e548494eed087c999cca47247ebbed serpentine-0.9.tar.bz2 +6e841e6c11796841656dba2678a558f0 serpentine-0.7.tar.bz2