From 68f4f7443ccdf0ee4a5dbd77386e55abd744cf84 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Jul 26 2008 17:05:27 +0000 Subject: - Update to new version - Fix Makefile install target --- diff --git a/fatsort-0.9.8.3-install.patch b/fatsort-0.9.8.3-install.patch new file mode 100644 index 0000000..fb89774 --- /dev/null +++ b/fatsort-0.9.8.3-install.patch @@ -0,0 +1,12 @@ +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 004bb2e..fa4689a 100644 --- a/fatsort.spec +++ b/fatsort.spec @@ -1,13 +1,16 @@ Name: fatsort -Version: 0.9.8.2 -Release: 2%{?dist} +Version: 0.9.8.3 +Release: 1%{?dist} Summary: Fatsort sorts the FAT of 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) @@ -19,7 +22,8 @@ their name but by their entry in the file allocation table. %prep %setup -q -%patch -p1 -b .CFLAGS +%patch0 -p1 -b .CFLAGS +%patch1 -p1 -b .install %build @@ -28,7 +32,6 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir} @@ -43,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 15 2008 Till Maas - 0.9.8.3-1 +- Update to new version +- Fix Makefile install target + * Mon Jul 07 2008 Till Maas - 0.9.8.2-2 - Fix CFLAGS handling in the Makefile (Red Hat Bug #454212) diff --git a/sources b/sources index f3fcb9c..18e0c10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3ff54fd3e262f2d4834d33129b8885aa fatsort-0.9.8.2.tar.gz +936d8acae7032fc1053a46e896fb53c0 fatsort-0.9.8.3.tar.gz