Remove pngtopnm dependency from the samples/ directory
authorH. Peter Anvin <hpa@zytor.com>
Tue, 26 Feb 2008 22:50:05 +0000 (14:50 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 26 Feb 2008 22:50:05 +0000 (14:50 -0800)
Ship syslogo.ppm.gz instead of syslogo.png, thereby eliminating a
dependency on pngtopnm which apparently isn't installed by default on
some distros.

NEWS
sample/Makefile
sample/syslogo.png [deleted file]
sample/syslogo.ppm.gz [new file with mode: 0644]
syslinux.spec.in

diff --git a/NEWS b/NEWS
index 5cafbc0..d57ca1f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ Changes in 3.62:
          command line.
        * ISOLINUX: Work around bug in certain Adaptec BIOSes,
          patch by Bruce Robson.
+       * pngtopnm dependency removed from samples/ directory.
 
 Changes in 3.61:
        * EXTLINUX: fix crash when accessing an empty file.
index 6894cec..bd64e90 100644 (file)
@@ -33,6 +33,8 @@ LDFLAGS    = -s
 OBJCOPY    = objcopy
 PPMTOLSS16 =   ../ppmtolss16
 LIB       = liboldcom32.a
+GZIP      = gzip
+PNGTOPNM   = pngtopnm
 
 LIBOBJS           = conio.o atou.o skipatou.o printf.o c32exit.o
 
@@ -64,10 +66,13 @@ $(LIB): $(LIBOBJS)
        $(AR) cq $@ $^
        $(RANLIB) $@
 
-syslogo.lss:   syslogo.png $(PPMTOLSS16)
-       pngtopnm syslogo.png | \
+%.lss: %.ppm.gz $(PPMTOLSS16)
+       $(GZIP) -cd $< | \
                $(PPMTOLSS16) \#000000=0 \#d0d0d0=7 \#f6f6f6=15 \
-               > syslogo.lss
+               > $@
+
+%.ppm.gz: %.png
+       $(PNGTOPNM) $< | gzip -9 > $@
 
 tidy:
        rm -f *.o *.a *.lst *.elf
diff --git a/sample/syslogo.png b/sample/syslogo.png
deleted file mode 100644 (file)
index 45b4b5e..0000000
Binary files a/sample/syslogo.png and /dev/null differ
diff --git a/sample/syslogo.ppm.gz b/sample/syslogo.ppm.gz
new file mode 100644 (file)
index 0000000..ee46d9b
Binary files /dev/null and b/sample/syslogo.ppm.gz differ
index d315bf4..32ab497 100644 (file)
@@ -11,7 +11,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{VERSION}.t
 ExclusiveArch: i386 i486 i586 i686 athlon pentium4 x86_64
 Packager: H. Peter Anvin <hpa@zytor.com>
 Buildroot: %{_tmppath}/%{name}-%{VERSION}-root
-BuildPrereq: nasm >= 0.98.39, perl, netpbm-progs
+BuildPrereq: nasm >= 0.98.39, perl
 Autoreq: 0
 %ifarch x86_64
 Requires: mtools, libc.so.6()(64bit)