- moved headers and examples to Glide3_SDK package (disabled by default - normally...

Changed files:
    Glide_V3-DRI.spec -> 1.54

diff --git a/Glide_V3-DRI.spec b/Glide_V3-DRI.spec
index 0ad17c6ebc79cb6cc02150dbf2bb39297bef5ab4..f8844dcea4659c822166661c69a218c67a809d3a 100644 (file)
--- a/Glide_V3-DRI.spec
+++ b/Glide_V3-DRI.spec
@@ -1,3 +1,7 @@
+#
+# 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
@@ -49,7 +53,8 @@ Summary:      Development headers for Glide 3.x
 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
@@ -67,7 +72,7 @@ Summary:      Static library Glide 3.x
 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
@@ -78,6 +83,22 @@ Voodoo3 cards.
 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
@@ -112,7 +133,6 @@ lub Voodoo3.
 
 %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 \
@@ -125,15 +145,21 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/tests
 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
@@ -154,9 +180,14 @@ rm -rf $RPM_BUILD_ROOT
 %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