rpms/svgalib/devel svgalib.spec, 1.5, 1.6 svgalib-1.9.21-wip.patch, 1.2, NONE svgalib-1.9.22.diff, 1.2, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/svgalib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32475

Modified Files:
	svgalib.spec 
Removed Files:
	svgalib-1.9.21-wip.patch svgalib-1.9.22.diff 
Log Message:
New upstream version, drop merged patches


Index: svgalib.spec
===================================================================
RCS file: /cvs/extras/rpms/svgalib/devel/svgalib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- svgalib.spec	16 Aug 2005 11:55:30 -0000	1.5
+++ svgalib.spec	5 Jan 2006 19:55:27 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		svgalib
-Version:	1.9.21
-Release:	5
+Version:	1.9.24
+Release:	1
 Exclusivearch:	%{ix86} x86_64
 Summary:	Low-level fullscreen SVGA graphics library
 
@@ -9,13 +9,11 @@
 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
-Patch4:		svgalib-1.9.21-wip.patch
-Patch5:		svgalib-1.9.21-cfg.patch
-Patch6:		svgalib-1.9.21-x86_64.patch
+Patch0:		svgalib-1.9.21-makefiles.patch
+Patch1:		svgalib-1.4.3-fhs.patch
+Patch2:		svgalib-1.9.21-demos.patch
+Patch3:		svgalib-1.9.21-cfg.patch
+Patch4:		svgalib-1.9.21-x86_64.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Provides:	libvga = %{version}-%{release}
 
@@ -39,14 +37,12 @@
 
 %prep
 %setup -q 
-%patch0 -p1
-%patch1 -p1 -b .makefiles
-%patch2 -p1 -b .fhs
-%patch3 -p1
-%patch4 -p1 -b .wip
-%patch5 -p1 -b .defaultcfg
+%patch0 -p1 -b .makefiles
+%patch1 -p1 -b .fhs
+%patch2 -p1
+%patch3 -p1 -b .defaultcfg
 %ifnarch %{ix86}
-%patch6 -p1 -b .x86_64
+%patch4 -p1 -b .x86_64
 %endif
 
 #the testlinear demo needs svgalib's internal libvga header, so copy it to the
@@ -76,7 +72,7 @@
 cd ..
 cd threeDKit
 make OPTIMIZE="-Wno-pointer-sign $RPM_OPT_FLAGS" LDFLAGS= \
-  prefix=%{_prefix} lib3dkit.so.1.9.22
+  prefix=%{_prefix} lib3dkit.so.%{version}
 cd ..
 
 %install
@@ -129,6 +125,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jan  5 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.24-1
+- New upstream version, drop merged patches.
+
 * Tue Aug 16 2005 Hans de Goede <j.w.r.degoede at hhs.nl> 1.9.21-5
 - Merge with upstream, drop merged patches, fix dark vga modes on radeon.
 


--- svgalib-1.9.21-wip.patch DELETED ---


--- svgalib-1.9.22.diff DELETED ---