From 277b90c22b212f8ecf916ffd349e0a5993e78fc7 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Mon, 23 Oct 2006 19:43:31 +0000
Subject: [PATCH 1/4] Initialize branch FC-6 for xmms-modplug

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..d5b6362
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+FC-6

From 820be69836349bfa7a8bd8203d7588ec71109f63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Mon, 11 Dec 2006 22:29:10 +0000
Subject: [PATCH 2/4] - Apply upstream patch to fix crash if some unarchivers
 are not found     (#217195)

---
 .cvsignore        | 1 +
 sources           | 1 +
 xmms-modplug.spec | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.cvsignore b/.cvsignore
index 131009d..ddc51af 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 modplugxmms-2.05.tar.gz
+xmms-modplug-2.05-archivers.patch
diff --git a/sources b/sources
index 88f953a..824be5e 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 2dd9b88a02978d3001b48863b8cffc5b  modplugxmms-2.05.tar.gz
+ca28ee9780105ba66034aaecd890f1b7  xmms-modplug-2.05-archivers.patch
diff --git a/xmms-modplug.spec b/xmms-modplug.spec
index b3423c6..14ca259 100644
--- a/xmms-modplug.spec
+++ b/xmms-modplug.spec
@@ -2,13 +2,14 @@
 
 Name:           xmms-modplug
 Version:        2.05
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
 Group:          Applications/Multimedia
 URL:            http://modplug-xmms.sourceforge.net/
 Source:         http://dl.sf.net/modplug-xmms/modplugxmms-%{version}.tar.gz
+Patch0:         %{name}-2.05-archivers.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xmms-devel
@@ -35,6 +36,7 @@ A command line mod player.
 
 %prep
 %setup -q -n modplugxmms-%{version}
+sed -e 's|"/usr/bin/uzip"|"/usr/bin/unzip"|' %{PATCH0} | patch -p1
 
 
 %build
@@ -63,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.05-8
+- Apply upstream patch to fix crash if some unarchivers are not found (#217195)
+
 * Wed Aug 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.05-7
 - Rebuild.
 

From 8eba746269655f479e47933e998ba3f3c0de2d87 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:35:09 +0000
Subject: [PATCH 3/4] 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 ac89726..55b0f57 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := xmms-modplug
 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 2543e790dfe16f0195520007086268596b9cfeb7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:00:08 +0000
Subject: [PATCH 4/4] 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 55b0f57..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xmms-modplug
-# $Id$
-NAME := xmms-modplug
-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 d5b6362..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-FC-6