- fix: added libglide3-vX.so symlink (tdfx_dri.so from XFree86 uses it)

  now -devel is not needed to use DRI with tdfx driver
- am16 patch (needed for am 1.6), added -f to automake call
- release 0.snap.7

Changed files:
    Glide_V5-DRI.spec -> 1.10
    glide-am16.patch -> 1.1

diff --git a/Glide_V5-DRI.spec b/Glide_V5-DRI.spec
index 4862808562c3ed11d8a40ca1d21c1cf5f260af26..2df0fbf4a252fbb3c1256e8cc18ef4d643907e13 100644 (file)
--- a/Glide_V5-DRI.spec
+++ b/Glide_V5-DRI.spec
@@ -3,7 +3,7 @@ Summary:        Glide runtime for 3Dfx Voodoo4 and Voodoo5 boards
 Summary(pl):   Biblioteki Glide dla kart 3Dfx Voodoo4 i Voodoo5
 Name:          Glide_V5-DRI
 Version:       3.10.0
-Release:       0.%{snapdate}.6
+Release:       0.%{snapdate}.7
 Epoch:         1
 License:       3dfx Glide General Public License, 3Dfx Interactive Inc.
 Vendor:                3dfx Interactive Inc.
@@ -13,6 +13,7 @@ Patch0:               glide-ia64.patch
 Patch1:                glide-ac-workaround.patch
 Patch2:                glide-h3.patch
 Patch3:                glide-h5.patch
+Patch4:                glide-am16.patch
 Icon:          3dfx.gif
 URL:           http://glide.sourceforge.net/
 BuildRequires: XFree86-devel
@@ -73,13 +74,14 @@ Voodoo5.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 rm -f missing
 libtoolize --copy --force
 aclocal
 autoconf
-automake -a -c -i
+automake -a -c -f -i
 %configure \
        --enable-fx-dri-build \
        --enable-fx-glide-hw=h5 \
@@ -102,6 +104,9 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/glide3/tests
        GLIDE_DEBUG_GDEFS="%{!?debug:-DBIG_OPT} %{?debug:-DGDBG_INFO_ON -DGLIDE_DEBUG}" \
        DESTDIR=$RPM_BUILD_ROOT
 
+# used by tdfx_dri.so from XFree86
+ln -sf libglide3.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libglide3-v5.so
+# used by ???
 ln -sf libglide3.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libglide3x_V5.so
 ln -sf libglide3.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
 
@@ -117,13 +122,14 @@ gzip -9nf glide_license.txt $RPM_BUILD_ROOT%{_examplesdir}/glide3/tests/t*.3df
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc glide_license.txt.gz
 %attr(755,root,root) %{_libdir}/libglide3.so.*.*.*
+%attr(755,root,root) %{_libdir}/libglide3-v5.so
 %attr(755,root,root) %{_libdir}/libglide3x.so
 %attr(755,root,root) %{_libdir}/libglide3x_V5.so
 

diff --git a/glide-am16.patch b/glide-am16.patch
new file mode 100644 (file)
index 0000000..3b000db
--- /dev/null
+++ b/glide-am16.patch
@@ -0,0 +1,24 @@
+--- glide3x-20010309/h3/glide3/src/makefile.autoconf.am.orig   Mon Mar 25 20:03:40 2002
++++ glide3x-20010309/h3/glide3/src/makefile.autoconf.am        Mon Mar 25 20:14:06 2002
+@@ -207,7 +207,8 @@
+ noinst_HEADERS         = fxglide.h gsstdef.h gsfc.h \
+                          fxcmd.h fxsplash.h tv.h rcver.h qmodes.h \
+                          macglide3.h
+-fxgasm_SOURCES         = fxgasm.c gthread.c
++fxgasm_SOURCES         = fxgasm.c
++fxgasm_LDADD           = gthread.o
+ 
+ lib_LTLIBRARIES        = libglide3.la
+ libglide3_la_SOURCES   = fxinline.h fxgasm.h \
+--- glide3x-20010309/h5/glide3/src/makefile.autoconf.am.orig   Mon Mar 25 20:03:40 2002
++++ glide3x-20010309/h5/glide3/src/makefile.autoconf.am        Mon Mar 25 20:17:12 2002
+@@ -215,7 +215,8 @@
+                          gsfc.h      gsstdef.h   \
+                          qmodes.h    tv.h        \
+                          fxgasm.h    fxinline.h
+-fxgasm_SOURCES         = fxgasm.c gthread.c
++fxgasm_SOURCES         = fxgasm.c
++fxgasm_LDADD           = gthread.o
+ fxgasm_DEPENDENCIES    = gthread.lo
+ 
+ lib_LTLIBRARIES        = libglide3.la