packages: Glide_V3-DRI/Glide_V3-DRI.spec - moved headers and examples to Gl...

[qboosh]

Author: qboosh                       Date: Sun Jan 15 14:00:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- moved headers and examples to Glide3_SDK package (disabled by default - normally it will be built from Glide_V5-DRI.spec)

---- Files affected:
packages/Glide_V3-DRI:
   Glide_V3-DRI.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: packages/Glide_V3-DRI/Glide_V3-DRI.spec
diff -u packages/Glide_V3-DRI/Glide_V3-DRI.spec:1.53 packages/Glide_V3-DRI/Glide_V3-DRI.spec:1.54
--- packages/Glide_V3-DRI/Glide_V3-DRI.spec:1.53	Sun Jan  8 12:14:37 2012
+++ packages/Glide_V3-DRI/Glide_V3-DRI.spec	Sun Jan 15 15:00:16 2012
@@ -1,4 +1,8 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	glide3_sdk	# build glide3x SDK here (normally built from Glide_V5-DRI.spec)
+#
 %define snapdate 20010309
 %define	rel	16
 Summary:	Glide runtime for 3Dfx Voodoo Banshee and Voodoo3 boards
@@ -50,7 +54,8 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe Glide 3.x
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Provides:	Glide3-DRI-devel
+Requires:	Glide3x_SDK >= %{epoch}:%{version}
+Provides:	Glide3-DRI-devel = %{version}
 Obsoletes:	Glide_V5-DRI-devel
 
 %description devel
@@ -68,7 +73,7 @@
 Summary(pl.UTF-8):	Statyczne biblioteki Glide 3.x
 Group:		X11/Development/Libraries
 Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
-Provides:	Glide3-DRI-static
+Provides:	Glide3-DRI-static = %{version}
 Obsoletes:	Glide_V5-DRI-static
 
 %description static
@@ -79,6 +84,22 @@
 Ten pakiet zawiera statyczne biblioteki Glide3 dla kart Voodoo Banshee
 lub Voodoo3.
 
+%package -n Glide3x_SDK
+Summary:	Development libraries for Glide 3.x
+Summary(pl.UTF-8):	Część Glide 3.x przeznaczona dla programistów
+Group:		Development/Libraries
+Conflicts:	Glide_SDK
+
+%description -n Glide3x_SDK
+This package includes the header files and test files necessary for
+developing applications that use any of the 3D accelerators in the
+3Dfx Interactive Voodoo line utilizing Glide 3.x interface.
+
+%description -n Glide3x_SDK -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe i pliki testowe potrzebne do
+tworzenia aplikacji korzystających z akceleratorów 3D serii 3Dfx
+Interactive Voodoo przy użyciu interfejsu Glide 3.x.
+
 %prep
 %setup -q -n glide3x-%{snapdate}
 %patch0 -p1
@@ -113,7 +134,6 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests
 
 # something is recompiled - use GCFLAGS too
 %{__make} -f makefile.autoconf install \
@@ -126,15 +146,21 @@
 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
+# used by dlopen in X driver
 ln -sf libglide3.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
 
+%if %{with glide3_sdk}
 # Install the examples and their source, no binaries
-install h3/glide3/tests/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests/makefile
-install h3/glide3/tests/*.3df $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests
-install h3/glide3/tests/test??.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests
-install h3/glide3/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests
-install h3/glide3/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests
-gzip -9nf $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests/*.3df
+install -d $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install h3/glide3/tests/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests/makefile
+install h3/glide3/tests/*.3df $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install h3/glide3/tests/test??.c $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install h3/glide3/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install h3/glide3/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+gzip -9nf $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests/*.3df
+%else
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/glide3
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -155,19 +181,27 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libglide3.so
 %{_libdir}/libglide3.la
-%{_includedir}/glide3
-%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libglide3.a
 
+%if %{with glide3_sdk}
+%files -n Glide3_SDK
+%defattr(644,root,root,755)
+%{_includedir}/glide3
+%{_examplesdir}/%{name}-%{version}
+%endif
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2012/01/15 14:00:16  qboosh
+- moved headers and examples to Glide3_SDK package (disabled by default - normally it will be built from Glide_V5-DRI.spec)
+
 Revision 1.53  2012/01/08 11:14:37  qboosh
 - merged gcc4 patch and more complete no_redefine_macro patch (based on Debian patches) from Glide_V5-DRI
 - dropped buggy gcc 4 parts from gcc34 patch (introduced wrong pointer arithmetic)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Glide_V3-DRI/Glide_V3-DRI.spec?r1=1.53&r2=1.54&f=u