rpms/fatsort/devel fatsort-0.9.8-install.patch, NONE, 1.1 fatsort.spec, 1.12, 1.13

[Till Maas (till)]

Author: till

Update of /cvs/pkgs/rpms/fatsort/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27465

Modified Files:
	fatsort.spec 
Added Files:
	fatsort-0.9.8-install.patch 
Log Message:
* Mon Jun 09 2008 Till Maas <opensource till name> - 0.9.8-1
- New upstream release
- move install to Makefile/patch
- ChangeLog is now CHANGES


fatsort-0.9.8-install.patch:

--- NEW FILE fatsort-0.9.8-install.patch ---
diff -up fatsort-0.9.8/Makefile.install fatsort-0.9.8/Makefile
diff -up fatsort-0.9.8/Makefile.install fatsort-0.9.8/Makefile
--- fatsort-0.9.8/Makefile.install	2007-10-17 16:05:47.000000000 +0200
+++ fatsort-0.9.8/Makefile	2008-06-09 21:54:51.000000000 +0200
@@ -1,5 +1,8 @@
+SBINDIR=/usr/sbin
+
 all:
 	$(MAKE) -C src/
 clean:
 	$(MAKE) -C src/ clean
-
+install:
+	install -m 0755 -p -D src/fatsort $(DESTDIR)$(SBINDIR)


Index: fatsort.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fatsort/devel/fatsort.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fatsort.spec	9 Jun 2008 19:48:47 -0000	1.12
+++ fatsort.spec	9 Jun 2008 20:03:34 -0000	1.13
@@ -7,6 +7,8 @@
 License:        GPLv2+
 URL:            http://%{name}.berlios.de/
 Source0:        http://download2.berlios.de/%{name}/%{name}-%{version}.tar.gz
+# 2008-06-09: sent to upstream
+Patch0:         fatsort-0.9.8-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -18,7 +20,7 @@
 
 %prep
 %setup -q
-
+%patch -p1 -b .install
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -28,7 +30,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_sbindir}
-install -m 0755 -p fatsort $RPM_BUILD_ROOT/%{_sbindir}
+make install DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}
 
 
 %clean
@@ -37,13 +39,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE.txt README TODO
+%doc CHANGES LICENSE.txt README TODO
 %{_sbindir}/fatsort
 
 
 %changelog
 * Mon Jun 09 2008 Till Maas <opensource till name> - 0.9.8-1
 - New upstream release
+- move install to Makefile/patch
+- ChangeLog is now CHANGES
 
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.7.1-3
 - Autorebuild for GCC 4.3