From 7401aca9095898c16b0da3696544987791064c4b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 09:53:58 +0000 Subject: [PATCH 1/5] Initialize branch F-7 for serpentine --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 903d7308e480d6c3fe1aae3e99e526a8fd33bcb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 16:20:35 +0000 Subject: [PATCH 2/5] new release --- serpentine.spec | 14 ++++++++++---- sources | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/serpentine.spec b/serpentine.spec index 9961f83..e27879a 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -1,13 +1,13 @@ %{!?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: 1%{?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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -18,6 +18,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 @@ -75,6 +76,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 diff --git a/sources b/sources index d955acc..d5f3b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6e841e6c11796841656dba2678a558f0 serpentine-0.7.tar.bz2 +12e548494eed087c999cca47247ebbed serpentine-0.9.tar.bz2 From f01167e58f4c53665296bf128d9619001e0011ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Sat, 24 Nov 2007 17:00:35 +0000 Subject: [PATCH 3/5] add patch --- serpentine-0.9-plugususpend.patch | 71 +++++++++++++++++++++++++++++++ serpentine.spec | 5 ++- 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 serpentine-0.9-plugususpend.patch diff --git a/serpentine-0.9-plugususpend.patch b/serpentine-0.9-plugususpend.patch new file mode 100644 index 0000000..dc5fa71 --- /dev/null +++ b/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 +# 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 e27879a..efa6234 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -2,13 +2,15 @@ Name: serpentine Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Audio CD Burner Group: Applications/Multimedia 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 @@ -31,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 From b4c1ec1944b03e9e7cfc4decd07fed56b6bcf005 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:53 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8ac417b..9da0fd3 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2a8f7c0a8f5fec2a51769c1a5ffcbd22a0c46c86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:37:15 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 9da0fd3..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7