Re: Review still needed: svgalib

[Matthias Saou <thias spam spam spam spam spam spam spam egg and spam freshrpms net>]

Hans de Goede wrote :

> The svgalib package provides the SVGAlib low-level graphics library
> for Linux.  SVGAlib is a library which allows applications to use full
> screen graphics on a variety of hardware platforms. Some games and
> utilities use SVGAlib for their graphics. For details on
> supported chipsets, see man 7 svgalib (when svgalib is installed).
[...]
> The srpm can be downloaded from:
> http://home.zonnet.nl/jwrdegoede/svgalib-1.9.21-2.src.rpm

Attached is a quick patch to the spec file. Further reviewing is still
needed, as I haven't tested the resulting package (the part on which
you've invested the vast majority of the work).

Changes :
- Unify tabs and spaces.
- Fix main source URL.
- Remove unneeded zero epochs.
- Remove -c (ignored) option to install, use -p instead.
- Remove unneeded explicit(er) compression of man pages.
- Use %ifnarch instead of empty %ifarch + %else.

And a few even less important other cosmetic changes.

Matthias

-- 
Clean custom Red Hat Linux rpm packages : http://freshrpms.net/
Fedora Core release 4 (Stentz) - Linux kernel 2.6.12-1.1398_FC4
Load : 0.35 1.23 1.27

--- svgalib.spec.orig	2005-08-03 16:13:41.000000000 +0200
+++ svgalib.spec	2005-08-03 16:20:12.000000000 +0200
@@ -1,25 +1,23 @@
-Name:           svgalib
-Version:        1.9.21
-Release:        2
-Epoch:          0
-Exclusivearch:	%{ix86} x86_64 ppc
-Summary:	A low-level fullscreen SVGA graphics library.
-
-Group:          System Environment/Libraries
-License:        Public Domain
-URL:            http://www.svgalib.org
-Source:		http://www.svgalib.org/svgalib-%{version}.tar.gz
+Name:		svgalib
+Version:	1.9.21
+Release:	2
+Summary:	Low-level fullscreen SVGA graphics library
+
+Group:		System Environment/Libraries
+License:	Public Domain
+URL:		http://www.svgalib.org/
+Source0:	http://www.arava.co.il/matan/svgalib/svgalib-%{version}.tar.gz
 Source1:	svgalib-todo
 Patch0:		svgalib-1.9.22.diff
-Patch1: 	svgalib-1.9.21-makefiles.patch
-Patch2: 	svgalib-1.4.3-fhs.patch
-Patch3: 	svgalib-1.9.21-demos.patch
+Patch1:		svgalib-1.9.21-makefiles.patch
+Patch2:		svgalib-1.4.3-fhs.patch
+Patch3:		svgalib-1.9.21-demos.patch
 Patch4:		svgalib-1.9.21-wip.patch
 Patch5:		svgalib-1.9.21-wip2.patch
 Patch6:		svgalib-1.9.21-cfg.patch
 Patch7:		svgalib-1.9.21-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:	libvga = %{epoch}:%{version}-%{release}
+Provides:	libvga = %{version}-%{release}
 
 %description
 The svgalib package provides the SVGAlib low-level graphics library
@@ -29,10 +27,11 @@ utilities use SVGAlib for their graphics
 supported chipsets, see man 7 svgalib (when svgalib is installed).
 
 %package devel
-Summary: 	Development tools for the SVGAlib graphics library.
+Summary:	Development tools for the SVGAlib graphics library
 Group:		Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
-Provides:       libvga-devel = %{epoch}:%{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
+Provides:	libvga-devel = %{version}-%{release}
+
 %description devel
 The svgalib-devel package contains the libraries and header files
 needed to build programs which will use the SVGAlib low-level graphics
@@ -47,8 +46,7 @@ library.
 %patch4 -p1 -b .wip
 %patch5 -p1 -b .wip2
 %patch6 -p1 -b .defaultcfg
-%ifarch {%ix86}
-%else
+%ifnarch %{ix86}
 %patch7 -p1 -b .x86_64
 %endif
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
@@ -75,9 +73,11 @@ make OPTIMIZE="-Wno-pointer-sign $RPM_OP
 cd utils
 make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
   prefix=%{_prefix}
-cd ../threeDKit
+cd ..
+cd threeDKit
 make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
   prefix=%{_prefix} lib3dkit.so.1.9.22
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,11 +89,10 @@ make \
   mandir=$RPM_BUILD_ROOT/%{_mandir} \
   sharedlibdir=$RPM_BUILD_ROOT/%{_libdir} \
   NO_HELPER=y \
-  MANFORMAT=compressed \
-  "INSTALL_PROGRAM=install -c -m 755" \
-  "INSTALL_SCRIPT=install -c -m 755" \
-  "INSTALL_SHLIB=install -c -m 755" \
-  "INSTALL_DATA=install -c -m 644" \
+  "INSTALL_PROGRAM=install -p -m 755" \
+  "INSTALL_SCRIPT=install -p -m 755" \
+  "INSTALL_SHLIB=install -p -m 755" \
+  "INSTALL_DATA=install -p -m 644" \
   install
 #for %ghost
 touch $RPM_BUILD_ROOT/etc/vga/fontdata
@@ -110,7 +109,7 @@ rm -fr $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc doc/CHANGES doc/README.joystick doc/README.keymap lrmi-0.6m/README
 %doc doc/README.multi-monitor doc/README.vesa doc/TODO doc/dual-head-howto
-%dir %{_sysconfdir}/vga
+%dir %{_sysconfdir}/vga/
 %config(noreplace) %{_sysconfdir}/vga/dvorak-us.keymap
 %config(noreplace) %{_sysconfdir}/vga/libvga.config
 %config(noreplace) %{_sysconfdir}/vga/libvga.et4000
@@ -124,14 +123,12 @@ rm -fr $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %doc demos doc/DESIGN doc/Driver-programming-HOWTO doc/README.patching
-%{_libdir}/libvga.so
-%{_libdir}/libvgagl.so
-%{_libdir}/lib3dkit.so
 %{_includedir}/*
+%{_libdir}/*.so
 %{_mandir}/man3/*
 
 %changelog
-* Wed Aug 3 2005 Hans de Goede <j w r degoede hhs nl> 0:1.9.21-2
+* Wed Aug 3 2005 Hans de Goede <j w r degoede hhs nl> 1.9.21-2
 - I've been working with upstream to get most patches intergrated, so
   most patches are gone now.
 - Reviewed and fixed the entire source tree for 64 bit cleanness.
@@ -151,7 +148,7 @@ rm -fr $RPM_BUILD_ROOT
 - Patch7: remove options not avaible on non-i386 from the configfile when
   building for non-i386
 
-* Fri Jul 1 2005 Hans de Goede <j w r degoede hhs nl> 0:1.9.21-1
+* Fri Jul 1 2005 Hans de Goede <j w r degoede hhs nl> 1.9.21-1
 - Yet another attempt at getting svgalib into Fedora Extras (formerly .us)
 - Upstream has reintroduced suid root use in 1.9.20 as an alternative to the
   helper-kernel-module. This allows us to build a sane (kernel module free)