Author: eandry Date: Tue Dec 5 22:04:24 2006 New Revision: 91378 Added: packages/cooker/fdutils/current/SOURCES/fdutils-5.4-linux2.6-buildfix.patch packages/cooker/fdutils/current/SOURCES/fdutils-5.5.tar.bz2 (contents, props changed) packages/cooker/fdutils/current/SOURCES/fdutils-Makefile-fixes.patch packages/cooker/fdutils/current/SOURCES/fdutils-manpages.patch Removed: packages/cooker/fdutils/current/SOURCES/fdutils-5.4-20030718.diff.bz2 packages/cooker/fdutils/current/SOURCES/fdutils-5.4-linux2.6-buildfix.patch.bz2 packages/cooker/fdutils/current/SOURCES/fdutils-5.4.tar.bz2 packages/cooker/fdutils/current/SOURCES/fdutils-Makefile-fixes.patch.bz2 packages/cooker/fdutils/current/SOURCES/fdutils-manpages.patch.bz2 Modified: packages/cooker/fdutils/current/SPECS/fdutils.spec
Log: New version 5.5 bunzipped patches %%mkrel drop patch 0 (applied upstream) Added: packages/cooker/fdutils/current/SOURCES/fdutils-5.4-linux2.6-buildfix.patch ============================================================================== --- (empty file) +++ packages/cooker/fdutils/current/SOURCES/fdutils-5.4-linux2.6-buildfix.patch Tue Dec 5 22:04:24 2006 @@ -0,0 +1,11 @@ +--- fdutils-5.4/src/fdmount.c~ 2004-04-17 13:44:16.497905142 +0200 ++++ fdutils-5.4/src/fdmount.c 2004-04-17 13:45:02.448596169 +0200 +@@ -22,7 +22,7 @@ + #include <linux/ext_fs.h> + #endif + +-#include <linux/ext2_fs.h> ++#include <ext2fs/ext2_fs.h> + + #ifdef HAVE_LINUX_XIA_FS_H + #include <linux/xia_fs.h> Added: packages/cooker/fdutils/current/SOURCES/fdutils-5.5.tar.bz2 ============================================================================== Binary file. No diff available. Added: packages/cooker/fdutils/current/SOURCES/fdutils-Makefile-fixes.patch ============================================================================== --- (empty file) +++ packages/cooker/fdutils/current/SOURCES/fdutils-Makefile-fixes.patch Tue Dec 5 22:04:24 2006 @@ -0,0 +1,83 @@ +--- fdutils-5.4/src/Makefile.in.fpons 2003-10-14 16:52:57.000000000 +0200 ++++ fdutils-5.4/src/Makefile.in 2003-10-14 16:55:06.000000000 +0200 +@@ -123,20 +123,20 @@ + + install-bin: all + $(top_srcdir)/mkinstalldirs $(bindir) +- $(INSTALL) -c -m $(PERM) -o $(UID) -g $(GID) $(srcdir)/MAKEFLOPPIES $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskd $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) diskseekd $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppycontrol $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) floppymeter $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) getfdprm $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) setfdprm $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) fdrawcmd $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) superformat $(bindir) +- $(INSTALL) -c -s -m $(PERM) -o $(UID) -g $(GID) xdfcopy $(bindir) +- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir) +- $(INSTALL) -c -s -m $(SPERM) -o $(UID) -g $(GID) fdmount $(bindir)/fdumount ++ $(INSTALL) -c -m $(PERM) $(srcdir)/MAKEFLOPPIES $(bindir) ++ $(INSTALL) -c -s -m $(PERM) diskd $(bindir) ++ $(INSTALL) -c -s -m $(PERM) diskseekd $(bindir) ++ $(INSTALL) -c -s -m $(PERM) floppycontrol $(bindir) ++ $(INSTALL) -c -s -m $(PERM) floppymeter $(bindir) ++ $(INSTALL) -c -s -m $(PERM) getfdprm $(bindir) ++ $(INSTALL) -c -s -m $(PERM) setfdprm $(bindir) ++ $(INSTALL) -c -s -m $(PERM) fdrawcmd $(bindir) ++ $(INSTALL) -c -s -m $(PERM) superformat $(bindir) ++ $(INSTALL) -c -s -m $(PERM) xdfcopy $(bindir) ++ $(INSTALL) -c -s -m $(SPERM) fdmount $(bindir) ++ $(INSTALL) -c -s -m $(SPERM) fdmount $(bindir)/fdumount + ( cd $(bindir); \ +- ln -sf xdfcopy $(bindir)/xdfformat; \ +- ln -sf fdmount $(bindir)/fdumount; \ +- ln -sf fdmount $(bindir)/fdlist; \ +- ln -sf fdmount $(bindir)/fdmountd ) ++ ln xdfcopy $(bindir)/xdfformat; \ ++ ln fdmount $(bindir)/fdumount; \ ++ ln fdmount $(bindir)/fdlist; \ ++ ln fdmount $(bindir)/fdmountd ) +--- fdutils-5.4/doc/Makefile.in.fpons 2003-10-14 16:51:55.000000000 +0200 ++++ fdutils-5.4/doc/Makefile.in 2003-10-14 16:52:28.000000000 +0200 +@@ -105,17 +105,17 @@ + $(top_srcdir)/mkinstalldirs $(mandir4) + $(top_srcdir)/mkinstalldirs $(mandir8) + for i in $(MANPAGES1); do \ +- install -c -m $(MANPERM) -o $(UID) -g $(GID) \ ++ install -c -m $(MANPERM) \ + $(srcdir)/$$i $(mandir1)/$$i; \ + done + + for i in $(MANPAGES4); do \ +- install -c -m $(MANPERM) -o $(UID) -g $(GID) \ ++ install -c -m $(MANPERM) \ + $(srcdir)/$$i $(mandir4)/$$i; \ + done + + # for i in $(MANPAGES8); do \ +-# install -c -m $(MANPERM) -o $(UID) -g $(GID) \ ++# install -c -m $(MANPERM) \ + # $(srcdir)/$$i $(mandir8)/$$i; \ + # done + +@@ -129,17 +129,17 @@ + install-zman: + for i in $(MANPAGES1); do \ + gzip < $(srcdir)/$$i >_; \ +- install -c -m $(MANPERM) -o $(UID) -g $(GID) \ ++ install -c -m $(MANPERM) \ + _ $(mandir1)/$$i.gz; \ + done + for i in $(MANPAGES4); do \ + gzip < $(srcdir)/$$i >_; \ +- install -c -m $(MANPERM) -o $(UID) -g $(GID) \ ++ install -c -m $(MANPERM) \ + _ $(mandir4)/$$i.gz; \ + done + for i in $(MANPAGES8); do \ + gzip < $(srcdir)/$$i >_; \ +- install -c -m $(MANPERM) -o $(UID) -g $(GID) \ ++ install -c -m $(MANPERM) \ + _ $(mandir8)/$$i.gz; \ + done + rm _ Added: packages/cooker/fdutils/current/SOURCES/fdutils-manpages.patch ============================================================================== --- (empty file) +++ packages/cooker/fdutils/current/SOURCES/fdutils-manpages.patch Tue Dec 5 22:04:24 2006 @@ -0,0 +1,14 @@ +This patch just stops "make install" from installing the manpages for +the two programs which are not installed by default. + +--- fdutils-5.2/doc/Makefile.in.orig Fri Aug 29 13:36:47 1997 ++++ fdutils-5.2/doc/Makefile.in Fri Aug 29 13:37:18 1997 +@@ -18,7 +18,7 @@ + mandir4 = $(mandir)/man4 + mandir8 = $(mandir)/man8 + +-MANPAGES1 = diskd.1 fdrawcmd.1 getfdprm.1 superformat.1 diskseekd.1 \ ++MANPAGES1 = fdrawcmd.1 getfdprm.1 superformat.1 \ + floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \ + floppymeter.1 setfdprm.1 + Modified: packages/cooker/fdutils/current/SPECS/fdutils.spec ============================================================================== --- packages/cooker/fdutils/current/SPECS/fdutils.spec (original) +++ packages/cooker/fdutils/current/SPECS/fdutils.spec Tue Dec 5 22:04:24 2006 @@ -1,13 +1,13 @@ Summary: Programs for dealing with floppy disks Name: fdutils -Version: 5.4 -Release: 13mdk +Version: 5.5 +Release: %mkrel 1 URL: http://fdutils.linux.lu/ Source0: http://fdutils.linux.lu/%{name}-%{version}.tar.bz2 -Patch0: fdutils-5.4-20030718.diff.bz2 -Patch1: fdutils-manpages.patch.bz2 -Patch2: fdutils-Makefile-fixes.patch.bz2 -Patch3: fdutils-5.4-linux2.6-buildfix.patch.bz2 +#Patch0: fdutils-5.4-20030718.diff +Patch1: fdutils-manpages.patch +Patch2: fdutils-Makefile-fixes.patch +Patch3: fdutils-5.4-linux2.6-buildfix.patch License: GPL Group: System/Kernel and hardware ExclusiveOS: Linux @@ -27,7 +27,7 @@ %prep %setup -q -%patch0 -p1 +#%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -b .peroyvind @@ -46,7 +46,7 @@ %makeinstall -cp src/mediaprm $RPM_BUILD_ROOT/%{_sysconfdir} +#cp src/mediaprm $RPM_BUILD_ROOT/%{_sysconfdir} rm -f $RPM_BUILD_ROOT%{_bindir}/{diskd,diskseekd,setfdprm}
