dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: serpentine
-# $Id$
-NAME := serpentine
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

serpentine-0.9-plugususpend.patch

@@ -0,0 +1,71 @@
+# Bazaar revision bundle v0.9
+#
+# message:
+#   Added support for both versions of suspend.
+# committer: Tiago Cogumbreiro <cogumbreiro@users.sf.net>
+# 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
+
+

serpentine.spec

@@ -1,14 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           serpentine
-Version:        0.7
-Release:        6%{?dist}
+Version:        0.9
+Release:        2%{?dist}
 Summary:        Audio CD Burner
 
 Group:          Applications/Multimedia
-License:        GPL
-URL:            http://s1x.homelinux.net/projects/serpentine
+License:        GPLv2+
+URL:            http://www.irrepupavel.com/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
 
@@ -18,6 +20,7 @@ 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
 
@@ -30,6 +33,7 @@ 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
@@ -75,6 +79,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 22 2007 Sindre Pedersen Bjørdal <foolish@guezz.net> - 0.9-1
+- New release
+- Add missing PyXML dependency
+- Update License tag
+- Update Homepage link
 * Sat Dec 23 2006 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.7-6%{?dist}
 - Rebuild with Python 2.5
 

sources

@@ -1 +1 @@
-6e841e6c11796841656dba2678a558f0  serpentine-0.7.tar.bz2
+12e548494eed087c999cca47247ebbed  serpentine-0.9.tar.bz2