From c50c96c5b9f1a77691b36867822a7dab4915ada3 Mon Sep 17 00:00:00 2001
From: Till Maas <till@fedoraproject.org>
Date: Dec 02 2008 20:58:19 +0000
Subject: - Update to new release, that really contains the upstreamed patches


---

diff --git a/.cvsignore b/.cvsignore
index b9b5914..16efe13 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fatsort-0.9.7.1.tar.gz
+fatsort-0.9.9.1.tar.gz
diff --git a/fatsort-0.9.8.2-CFLAGS.patch b/fatsort-0.9.8.2-CFLAGS.patch
deleted file mode 100644
index c1434b0..0000000
--- a/fatsort-0.9.8.2-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up fatsort-0.9.8.2/src/Makefile.CFLAGS fatsort-0.9.8.2/src/Makefile
---- fatsort-0.9.8.2/src/Makefile.CFLAGS	2008-06-11 18:39:38.000000000 +0200
-+++ fatsort-0.9.8.2/src/Makefile	2008-07-07 00:54:49.000000000 +0200
-@@ -1,7 +1,8 @@
- CC=gcc
- LD=gcc
--CFLAGS += -g -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--LDFLAGS = -s 
-+CFLAGS= -g -Wall 
-+override CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-+LDFLAGS= -s 
- SBINDIR=/usr/local/sbin
- 
- all: fatsort
diff --git a/fatsort-0.9.8.3-install.patch b/fatsort-0.9.8.3-install.patch
deleted file mode 100644
index fb89774..0000000
--- a/fatsort-0.9.8.3-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up fatsort-0.9.8.3/src/Makefile.install fatsort-0.9.8.3/src/Makefile
---- fatsort-0.9.8.3/src/Makefile.install	2008-07-15 12:02:14.000000000 +0200
-+++ fatsort-0.9.8.3/src/Makefile	2008-07-15 12:02:50.000000000 +0200
-@@ -44,7 +44,7 @@ misc.o: misc.c misc.h options.h Makefile
- 	$(CC) ${CFLAGS} -c $< -o $@
- 
- install:
--	install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR)
-+	install -m 0755 -p -D fatsort $(DESTDIR)$(SBINDIR)/fatsort
- 
- clean:
- 	rm -f *.o fatsort
diff --git a/fatsort.spec b/fatsort.spec
index fa4689a..906788e 100644
--- a/fatsort.spec
+++ b/fatsort.spec
@@ -1,29 +1,23 @@
 Name:           fatsort
-Version:        0.9.8.3
+Version:        0.9.9.1
 Release:        1%{?dist}
-Summary:        Fatsort sorts the FAT of FAT16 and FAT32 filesystems
+Summary:        FAT sorter for FAT16 and FAT32 filesystems
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://%{name}.berlios.de/
 Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz
-# 2008-07-07: sent to upstream via personal e-mail
-Patch0:         fatsort-0.9.8.2-CFLAGS.patch
-# 2008-07-15: sent to upstream via personal e-mail
-Patch1:         fatsort-0.9.8.3-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
 Fatsort is a utility written in C to sort FAT16 and FAT32 filesystems. It is
 needed to sort files on cheap mp3 players that display files not sorted by
-their name but by their entry in the file allocation table.
+their name but by the order they appera in the file allocation table (FAT).
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .CFLAGS
-%patch1 -p1 -b .install
 
 
 %build
@@ -46,6 +40,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 02 2008 Till Maas <opensource@till.name> - 0.9.9.1-1
+- Update to new release, that really contains the upstreamed patches
+
+* Tue Dec 02 2008 Till Maas <opensource@till.name> - 0.9.9-1
+- Update to new release
+- Remove upstreamed patches
+
+* Sat Nov 22 2008 Till Maas <opensource@till.name> - 0.9.8.3-2
+- Update summary and description
+
 * Tue Jul 15 2008 Till Maas <opensource@till.name> - 0.9.8.3-1
 - Update to new version
 - Fix Makefile install target
diff --git a/sources b/sources
index 18e0c10..a2f7126 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-936d8acae7032fc1053a46e896fb53c0  fatsort-0.9.8.3.tar.gz
+c2fce4319e92d7ff26deb6e5729bc083  fatsort-0.9.9.1.tar.gz