X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Glide_V3-DRI.spec;h=25a6a0d1c3f26234d080854fb8a5ed9552f9d05a;hb=a539fb774b36db1837966cf8ba13758e5af44f73;hp=0b673fb453bbc0e8f1b7b4f6b6b9f1c8c2c86e9f;hpb=eaf3a8c4477ee2efc3dea64a64638c3ec3b18df7;p=packages%2FGlide_V3-DRI.git

diff --git a/Glide_V3-DRI.spec b/Glide_V3-DRI.spec
index 0b673fb..25a6a0d 100644
--- a/Glide_V3-DRI.spec
+++ b/Glide_V3-DRI.spec
@@ -1,35 +1,28 @@
-#
-# _with_3dnow	- with 3Dnow! instructions
 %define snapdate 20010309
 Summary:	Glide runtime for 3Dfx Voodoo Banshee and Voodoo3 boards
 Summary(pl):	Biblioteki Glide dla kart 3Dfx Voodoo Banshee oraz Voodoo3
 Name:		Glide_V3-DRI
 Version:	3.10.0
-Release:	0.%{snapdate}.2
+Release:	0.%{snapdate}.7
 Epoch:		1
-Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
 License:	3dfx Glide General Public License, 3Dfx Interactive Inc.
-URL:		http://glide.sourceforge.net/
+Vendor:		3dfx Interactive Inc.
+Group:		X11/Libraries
 Source0:	cvs://anonymous@cvs.glide.sourceforge.net:/cvsroot/glide/glide3x-%{snapdate}.tar.gz
 Patch0:		glide-ia64.patch
 Patch1:		glide-ac-workaround.patch
 Patch2:		glide-h3.patch
 Patch3:		glide-h5.patch
-Vendor:		3dfx Interactive Inc.
+Patch4:		glide-am16.patch
 Icon:		3dfx.gif
+URL:		http://glide.sourceforge.net/
 BuildRequires:	XFree86-devel
 BuildRequires:	automake
 BuildRequires:	autoconf
 BuildRequires:	libtool
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Provides:	Glide3-DRI
+Obsoletes:	Glide_V5-DRI
 
 %description 
 This library allows the user to use a 3dfx Interactive Voodoo Banshee
@@ -38,29 +31,23 @@ or non-DRI versions of Glide.
 
 %description -l pl
 Ta biblioteka pozwala u¿ytkownikowi na u¿ywanie kart 3dfx Interactive
-Voodoo Banshee lub Voodoo3 pod Linux'em z DRI. Ta wersja zawiera
+Voodoo Banshee lub Voodoo3 pod Linuksem z DRI. Ta wersja zawiera
 wsparcie dla wersji Glide z DRI i bez DRI.
 
 %package devel
 Summary:	Development headers for Glide 3.x
 Summary(pl):	Pliki nag³ówkowe Glide 3.x
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:	%{name} = %{version}
 Provides:	Glide3-DRI-devel
+Obsoletes:	Glide_V5-DRI-devel
 
 %description devel
 This package includes the headers files, documentation, and test files
 necessary for developing applications that use the 3Dfx Interactive
 Voodoo Banshee or Voodoo3 cards.
 
-%description -l pl devel
+%description devel -l pl
 Ten pakiet zawiera pliki nag³ówkowe, dokumentacje, oraz pliki tekstowe
 wymagane przez aplikacje deweloperskie, które u¿ywaj± kart 3Dfx
 Interactive Voodoo Banshe lub Voodoo3.
@@ -69,21 +56,15 @@ Interactive Voodoo Banshe lub Voodoo3.
 Summary:	Static library Glide 3.x
 Summary(pl):	Statyczne biblioteki Glide 3.x
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name}-devel = %{version}
 Provides:	Glide3-DRI-static
+Obsoletes:	Glide_V5-DRI-static
 
 %description static
 This package includes the static Glide3 library for Voodoo Banshee or
 Voodoo3 cards.
 
-%description -l pl static
+%description static -l pl
 Ten pakiet zawiera statyczne biblioteki Glide3 dla kart Voodoo Banshee
 lub Voodoo3.
 
@@ -93,18 +74,21 @@ lub Voodoo3.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 rm -f missing
 libtoolize --copy --force
 aclocal
-autoconf
-automake -a -c
+%{__autoconf}
+%{__automake} -i
 %configure \
 	--enable-fx-dri-build \
 	--enable-fx-glide-hw=h3 \
 	--enable-fx-debug=no \
-	%{?_with_3dnow:--enable-amd3d}
+%ifarch i586 i686 athlon
+	--enable-amd3d
+%endif
 
 %{__make} -f makefile.autoconf all \
 	GLIDE_DEBUG_GCFLAGS="%{rpmcflags} -fno-expensive-optimizations %{!?debug:-fomit-frame-pointer -ffast-math}" \
@@ -120,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-v3.so
+# used by ???
 ln -sf libglide3.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libglide3x_V3.so
 ln -sf libglide3.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
 
@@ -142,12 +129,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc glide_license.txt.gz
 %attr(755,root,root) %{_libdir}/libglide3.so.*.*.*
+%attr(755,root,root) %{_libdir}/libglide3-v3.so
 %attr(755,root,root) %{_libdir}/libglide3x.so
 %attr(755,root,root) %{_libdir}/libglide3x_V3.so
 
 %files devel
 %defattr(644,root,root,755)
-#%doc docs/*.pdf
 %{_examplesdir}/glide3
 %attr(755,root,root) %{_libdir}/lib*.la
 %attr(755,root,root) %{_libdir}/libglide3.so