packages: Glide_V3/Glide_V3.spec - I don't see any reason to use 2.2 as SDK...

qboosh qboosh at pld-linux.org
Fri Jan 13 19:08:51 CET 2012


Author: qboosh                       Date: Fri Jan 13 18:08:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- I don't see any reason to use 2.2 as SDK version; the version is 2.60 (at least for glide2x)
- use versioned dirs for examples

---- Files affected:
packages/Glide_V3:
   Glide_V3.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/Glide_V3/Glide_V3.spec
diff -u packages/Glide_V3/Glide_V3.spec:1.20 packages/Glide_V3/Glide_V3.spec:1.21
--- packages/Glide_V3/Glide_V3.spec:1.20	Mon Jan  9 21:12:29 2012
+++ packages/Glide_V3/Glide_V3.spec	Fri Jan 13 19:08:45 2012
@@ -32,7 +32,6 @@
 %package -n Glide_SDK
 Summary:	Development libraries for Glide 2.x
 Summary(pl.UTF-8):	Część Glide 2.x przeznaczona dla programistów
-Version:	2.2
 Group:		Development/Libraries
 
 %description -n Glide_SDK
@@ -64,8 +63,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir},%{_includedir}/{glide,glide3}} \
-	$RPM_BUILD_ROOT%{_examplesdir}/glide/{tests,tests3x} \
-	$RPM_BUILD_ROOT%{_examplesdir}/glide/texus/{lib,cmd,examples}
+	$RPM_BUILD_ROOT%{_examplesdir}/{glide2x,glide3x}-%{version}/tests \
+	$RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/texus/{lib,cmd,examples}
 
 ######################################################################
 # Install the Glide2x libraries
@@ -85,7 +84,6 @@
 # Install the Glide3X libraries
 ######################################################################
 install glide3x/h3/lib/libglide3.so.3.10 $RPM_BUILD_ROOT%{_libdir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/libglide3x.so
 
 # Create symlinks
 ln -sf libglide3.so.3 $RPM_BUILD_ROOT%{_libdir}/libglide3.so
@@ -114,49 +112,49 @@
 
 # Install the headers
 install swlibs/include/3dfx.h $RPM_BUILD_ROOT%{_includedir}/glide
+install swlibs/include/linutil.h $RPM_BUILD_ROOT%{_includedir}/glide
+install swlibs/include/texus.h $RPM_BUILD_ROOT%{_includedir}/glide
 install glide2x/h3/include/glide.h $RPM_BUILD_ROOT%{_includedir}/glide
 install glide2x/h3/include/glidesys.h $RPM_BUILD_ROOT%{_includedir}/glide
 install glide2x/h3/include/glideutl.h $RPM_BUILD_ROOT%{_includedir}/glide
 install glide2x/h3/include/sst1vid.h $RPM_BUILD_ROOT%{_includedir}/glide
 install glide2x/h3/include/gump.h $RPM_BUILD_ROOT%{_includedir}/glide
-install swlibs/include/linutil.h $RPM_BUILD_ROOT%{_includedir}/glide
-install swlibs/include/texus.h $RPM_BUILD_ROOT%{_includedir}/glide
 
 # Install the examples and their source
-install glide2x/h3/glide/tests/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide/tests/makefile
-install glide2x/h3/glide/tests/*.3df $RPM_BUILD_ROOT%{_examplesdir}/glide/tests
-install glide2x/h3/glide/tests/test??.c $RPM_BUILD_ROOT%{_examplesdir}/glide/tests
-install glide2x/h3/glide/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/glide/tests
-install glide2x/h3/glide/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/glide/tests
+install glide2x/h3/glide/tests/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/tests/makefile
+install glide2x/h3/glide/tests/*.3df $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/tests
+install glide2x/h3/glide/tests/test??.c $RPM_BUILD_ROOT%{_examplesdir}/glide2x-%{version}/tests
+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}/glide/texus/makefile
-install swlibs/texus/lib/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/lib/makefile
-install swlibs/texus/cmd/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/cmd/makefile
-install swlibs/texus/examples/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/examples/makefile
-install swlibs/texus/lib/*.c $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/lib
-install swlibs/texus/lib/texusint.h $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/lib
-install swlibs/texus/cmd/*.c $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/cmd
-install swlibs/texus/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/glide/texus/examples
+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 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
 
 ######################################################################
 # Install the Glide3x SDK material
 ######################################################################
 # Install the headers
 install swlibs/include/3dfx.h $RPM_BUILD_ROOT%{_includedir}/glide3
+install swlibs/include/linutil.h $RPM_BUILD_ROOT%{_includedir}/glide3
+install swlibs/include/texus.h $RPM_BUILD_ROOT%{_includedir}/glide3
 install glide3x/h3/include/glide.h $RPM_BUILD_ROOT%{_includedir}/glide3
 install glide3x/h3/include/glidesys.h $RPM_BUILD_ROOT%{_includedir}/glide3
 install glide3x/h3/include/glideutl.h $RPM_BUILD_ROOT%{_includedir}/glide3
 install glide3x/h3/include/sst1vid.h $RPM_BUILD_ROOT%{_includedir}/glide3
-install swlibs/include/linutil.h $RPM_BUILD_ROOT%{_includedir}/glide3
-install swlibs/include/texus.h $RPM_BUILD_ROOT%{_includedir}/glide3
 
 # Install the examples and their source
-install glide3x/h3/glide3/tests/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x/makefile
-install glide3x/h3/glide3/tests/*.3df $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x
-install glide3x/h3/glide3/tests/test??.c $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x
-install glide3x/h3/glide3/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x
-install glide3x/h3/glide3/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/glide/tests3x
+install glide3x/h3/glide3/tests/makefile.distrib $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests/makefile
+install glide3x/h3/glide3/tests/*.3df $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install glide3x/h3/glide3/tests/test??.c $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install glide3x/h3/glide3/tests/tldata.inc $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
+install glide3x/h3/glide3/tests/tlib.[ch] $RPM_BUILD_ROOT%{_examplesdir}/glide3x-%{version}/tests
 
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
 
@@ -190,9 +188,10 @@
 %files -n Glide_SDK
 %defattr(644,root,root,755)
 %doc docs2x/*.pdf docs3x/*.pdf
-%{_examplesdir}/glide
 %{_includedir}/glide
 %{_includedir}/glide3
+%{_examplesdir}/glide2x-%{version}
+%{_examplesdir}/glide3x-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -200,6 +199,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2012/01/13 18:08:45  qboosh
+- I don't see any reason to use 2.2 as SDK version; the version is 2.60 (at least for glide2x)
+- use versioned dirs for examples
+
 Revision 1.20  2012/01/09 20:12:29  qboosh
 - package READMEs
 
================================================================

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



More information about the pld-cvs-commit mailing list