packages: Glide_V3/Glide_V3.spec - dropped libglide2x.so.2/libglide3x.so.3 ...

[qboosh]

Author: qboosh                       Date: Sat Jan 14 21:25:33 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped libglide2x.so.2/libglide3x.so.3 symlinks (overkill)
- no need to package texus sources in SDKs

---- Files affected:
packages/Glide_V3:
   Glide_V3.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/Glide_V3/Glide_V3.spec
diff -u packages/Glide_V3/Glide_V3.spec:1.22 packages/Glide_V3/Glide_V3.spec:1.23
--- packages/Glide_V3/Glide_V3.spec:1.22	Fri Jan 13 22:13:28 2012
+++ packages/Glide_V3/Glide_V3.spec	Sat Jan 14 22:25:28 2012
@@ -81,9 +81,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/{glide,glide3}} \
-	$RPM_BUILD_ROOT%{_examplesdir}/{glide2x,glide3x}-%{version}/tests \
-	$RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/{lib,cmd,examples}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
 
 ######################################################################
 # Install the Glide2x libraries
@@ -96,8 +94,8 @@
 ln -sf libglide.so.2 $RPM_BUILD_ROOT%{_libdir}/libglide.so
 
 # Create a compatibility link for the old name
-ln -sf libglide.so.2.60 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so.2
-ln -sf libglide.so.2 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so
+# (X driver used to dlopen by libglide2x.so name)
+ln -sf libglide.so.2.60 $RPM_BUILD_ROOT%{_libdir}/libglide2x.so
 
 ######################################################################
 # Install the Glide3X libraries
@@ -108,8 +106,8 @@
 ln -sf libglide3.so.3 $RPM_BUILD_ROOT%{_libdir}/libglide3.so
 
 # Create a compatibility link for the old name
-ln -sf libglide3.so.3.10 $RPM_BUILD_ROOT%{_libdir}/libglide3x.so.3
-ln -sf libglide3.so.3 $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
+# (X driver used to dlopen by libglide3x.so name)
+ln -sf libglide3.so.3.10 $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
 
 ######################################################################
 # Install Texus
@@ -129,6 +127,9 @@
 # Install the Glide2x SDK material
 ######################################################################
 
+install -d $RPM_BUILD_ROOT%{_includedir}/{glide,glide3}} \
+	$RPM_BUILD_ROOT%{_examplesdir}/{glide2x-%{version}/{tests,texus/examples},glide3x-%{version}/tests}
+
 # Install the headers
 install swlibs/include/3dfx.h $RPM_BUILD_ROOT%{_includedir}/glide
 install swlibs/include/linutil.h $RPM_BUILD_ROOT%{_includedir}/glide
@@ -146,14 +147,8 @@
 install glide2x/h3/glide/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/tests
 install glide2x/h3/glide/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/tests
 
-# Install the Texus source
-install swlibs/texus/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/makefile
-install swlibs/texus/lib/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/lib/makefile
-install swlibs/texus/cmd/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/cmd/makefile
+# Install the Texus examples
 install swlibs/texus/examples/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/examples/makefile
-install swlibs/texus/lib/*.c $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/lib
-install swlibs/texus/lib/texusint.h $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/lib
-install swlibs/texus/cmd/*.c $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/cmd
 install swlibs/texus/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/examples
 
 ######################################################################
@@ -194,12 +189,10 @@
 %attr(755,root,root) %ghost %{_libdir}/libglide.so.2
 %attr(755,root,root) %{_libdir}/libglide.so
 %attr(755,root,root) %{_libdir}/libglide2x.so
-%attr(755,root,root) %{_libdir}/libglide2x.so.2
 %attr(755,root,root) %{_libdir}/libglide3.so.3.10
 %attr(755,root,root) %ghost %{_libdir}/libglide3.so.3
 %attr(755,root,root) %{_libdir}/libglide3.so
 %attr(755,root,root) %{_libdir}/libglide3x.so
-%attr(755,root,root) %{_libdir}/libglide3x.so.3
 %attr(755,root,root) %{_libdir}/libtexus.so.1.1
 %attr(755,root,root) %ghost %{_libdir}/libtexus.so.1
 %attr(755,root,root) %{_libdir}/libtexus.so
@@ -222,6 +215,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2012/01/14 21:25:28  qboosh
+- dropped libglide2x.so.2/libglide3x.so.3 symlinks (overkill)
+- no need to package texus sources in SDKs
+
 Revision 1.22  2012/01/13 21:13:28  qboosh
 - split Glide2x and Glide3x SDKs
 
================================================================

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