From df32d56aafaffb06e3630be3b802b78dbb8ec1bc Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 14:35:31 +0000 Subject: [PATCH 01/15] Initialize branch F-8 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..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 04a708e0b341dbb93eef1a112989beba40240dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 15:54:51 +0000 Subject: [PATCH 02/15] New release --- serpentine.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/serpentine.spec b/serpentine.spec index 9961f83..5bafaab 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 2006 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 From b8096b8d42c95e07e5241a7a74e5eacf9d406c1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 15:58:09 +0000 Subject: [PATCH 03/15] New release --- .cvsignore | 2 +- serpentine.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c90d66d..3d3dda7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -serpentine-0.7.tar.bz2 +serpentine-0.9.tar.bz2 diff --git a/serpentine.spec b/serpentine.spec index 5bafaab..e27879a 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Nov 22 2006 Sindre Pedersen Bjørdal - 0.9-1 +* Tue Nov 22 2007 Sindre Pedersen Bjørdal - 0.9-1 - New release - Add missing PyXML dependency - Update License tag 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 84c3e88e16f4334182e292efb0666fc17b19d6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 16:19:03 +0000 Subject: [PATCH 04/15] 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 16deb14865336293ea6a5a56b983515ef5ba9f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 22:49:07 +0000 Subject: [PATCH 05/15] add patch for ususpend plugin --- 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..de06bde 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}-plususpend.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 9c89e069bbbdc3188f82c21464af23666c1faaf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 22:52:30 +0000 Subject: [PATCH 06/15] fix typo --- serpentine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serpentine.spec b/serpentine.spec index de06bde..efa6234 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -9,7 +9,7 @@ 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}-plususpend.patch +Patch0: %{name}-%{version}-plugususpend.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch From a9ee3cb427ceb734f1b79bab7660305f00f72b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sindre=20Pedersen=20Bj=C3=B8rdal?= Date: Thu, 22 Nov 2007 23:06:56 +0000 Subject: [PATCH 07/15] Fix suspend plugin --- 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 6082c4020c43698f895b9742dab7ec0268a7b533 Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Sat, 29 Nov 2008 17:21:10 +0000 Subject: [PATCH 08/15] Rebuild for Python 2.6 --- serpentine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serpentine.spec b/serpentine.spec index efa6234..972fd0a 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -2,7 +2,7 @@ Name: serpentine Version: 0.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Audio CD Burner Group: Applications/Multimedia @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 330d322b7167bfa047741a4e8fd0220026b19202 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 00:35:08 +0000 Subject: [PATCH 09/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- serpentine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serpentine.spec b/serpentine.spec index 972fd0a..f340716 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -2,7 +2,7 @@ Name: serpentine Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Audio CD Burner Group: Applications/Multimedia @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From f5fd00b62a597a20a0ac3cdea0cbf12e63e82ffa Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 27 Jul 2009 04:11:48 +0000 Subject: [PATCH 10/15] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- serpentine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serpentine.spec b/serpentine.spec index f340716..1c0fd3d 100644 --- a/serpentine.spec +++ b/serpentine.spec @@ -2,7 +2,7 @@ Name: serpentine Version: 0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Audio CD Burner Group: Applications/Multimedia @@ -79,6 +79,9 @@ 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 From 0d3cb352a1db93a920d5a54ca108b27643c4b489 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 1 Sep 2009 17:30:57 +0000 Subject: [PATCH 11/15] Retired --- dead.package | 1 + 1 file changed, 1 insertion(+) create mode 100644 dead.package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..3c1b5b3 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Dead upstream From 97ab40ee7834d7397235bb8dfcc68ac2c325f5d7 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:15:29 +0000 Subject: [PATCH 12/15] 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 0bab46ca99ed9bb9438046b154ace926a9fbc228 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:38:54 +0000 Subject: [PATCH 13/15] 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 27d48d289e5b00dc5bfcf6b5c4319c33cc534856 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:37:15 +0000 Subject: [PATCH 14/15] 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 e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8 From fed458f01383407e7089dfe828d421b249d63c52 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:37:17 +0000 Subject: [PATCH 15/15] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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)