- up to 2.1.0

- ClanSDL is not supported anymore
- ClanLib now creates libclan21Core.so, libclan21Display.so (and so on), instead of naming it libclanCore.so and libclanDisplay.so
- BR: doxygen

Changed files:
    ClanLib.spec -> 1.110

diff --git a/ClanLib.spec b/ClanLib.spec
index 796e821d288e480da2c83007d03efde557e7a3db..b83c8d5dd8e609205b1e4bb9dab1b69b66c06ff1 100644 (file)
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -1,15 +1,18 @@
-%define        cvmajor 2.0
+#
+# TODO: include GL1 stuff
+#
+%define        cvmajor 2.1
 Summary:       ClanLib, the platform independent game SDK
 Summary(pl.UTF-8):     ClanLib, niezależny od platformy SDK do gier
 Summary(pt_BR.UTF-8):  SDK Clanlib
 Name:          ClanLib
-Version:       2.0.2
+Version:       2.1.0
 Release:       1
 License:       BSD-like (see COPYING)
 Group:         Libraries
 #Source0Download: http://www.clanlib.org/download.html
 Source0:       http://www.clanlib.org/download/releases-2.0/%{name}-%{version}.tgz
-# Source0-md5: 81a9e30e035fbb73a698813f67289505
+# Source0-md5: 099da97cd0051cc46f2a1c46cb498f6e
 Patch0:                %{name}-build.patch
 URL:           http://www.clanlib.org/
 BuildRequires: OpenGL-GLU-devel
@@ -18,6 +21,7 @@ BuildRequires:        SDL_gfx-devel >= 1.2.0
 BuildRequires: alsa-lib-devel
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake >= 1.6
+BuildRequires: doxygen
 BuildRequires: libjpeg-devel
 BuildRequires: libmikmod-devel
 BuildRequires: libpng-devel >= 1.%{cvmajor}
@@ -178,45 +182,6 @@ Static MikMod ClanLib library.
 %description MikMod-static -l pl.UTF-8
 Statyczna biblioteka MikMod dla ClanLiba.
 
-%package SDL
-Summary:       SDL ClanLib library
-Summary(pl.UTF-8):     Biblioteka SDL dla ClanLiba
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-
-%description SDL
-SDL ClanLib library.
-
-%description SDL -l pl.UTF-8
-Biblioteka SDL dla ClanLiba.
-
-%package SDL-devel
-Summary:       Header files for SDL ClanLib library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki SDL dla ClanLiba
-Group:         Development/Libraries
-Requires:      %{name}-SDL = %{version}-%{release}
-Requires:      %{name}-devel = %{version}-%{release}
-Requires:      SDL-devel >= 1.2.0
-Requires:      SDL_gfx-devel >= 1.2.0
-
-%description SDL-devel
-Header files for SDL ClanLib library.
-
-%description SDL-devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki SDL dla ClanLiba.
-
-%package SDL-static
-Summary:       Static SDL ClanLib library
-Summary(pl.UTF-8):     Statyczna biblioteka SDL dla ClanLiba
-Group:         Development/Libraries
-Requires:      %{name}-SDL-devel = %{version}-%{release}
-
-%description SDL-static
-Static SDL ClanLib library.
-
-%description SDL-static -l pl.UTF-8
-Statyczna biblioteka SDL dla ClanLiba.
-
 %package Vorbis
 Summary:       Vorbis ClanLib library
 Summary(pl.UTF-8):     Biblioteka Vorbis dla ClanLiba
@@ -315,50 +280,50 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING CREDITS README
-%attr(755,root,root) %{_libdir}/libclanApp-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanApp-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanCore-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanCore-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanDatabase-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanDatabase-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanDisplay-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanDisplay-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanGDI-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGDI-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanGUI-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGUI-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanNetwork-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanNetwork-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanRegExp-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanRegExp-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanSound-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSound-%{cvmajor}.so.1
-%attr(755,root,root) %{_libdir}/libclanSqlite-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSqlite-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21App-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21App-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Core-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Core-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Database-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Database-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Display-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Display-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21GDI-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21GDI-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21GUI-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21GUI-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Network-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Network-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21RegExp-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21RegExp-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Sound-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Sound-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Sqlite-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Sqlite-%{cvmajor}.so.1
 
 %files devel
 %defattr(644,root,root,755)
 %doc README.kdevelop UPGRADE.txt
-%attr(755,root,root) %{_libdir}/libclanApp.so
-%attr(755,root,root) %{_libdir}/libclanCore.so
-%attr(755,root,root) %{_libdir}/libclanDatabase.so
-%attr(755,root,root) %{_libdir}/libclanDisplay.so
-%attr(755,root,root) %{_libdir}/libclanGDI.so
-%attr(755,root,root) %{_libdir}/libclanGUI.so
-%attr(755,root,root) %{_libdir}/libclanNetwork.so
-%attr(755,root,root) %{_libdir}/libclanRegExp.so
-%attr(755,root,root) %{_libdir}/libclanSound.so
-%attr(755,root,root) %{_libdir}/libclanSqlite.so
-%{_libdir}/libclanApp.la
-%{_libdir}/libclanCore.la
-%{_libdir}/libclanDatabase.la
-%{_libdir}/libclanDisplay.la
-%{_libdir}/libclanGDI.la
-%{_libdir}/libclanGUI.la
-%{_libdir}/libclanNetwork.la
-%{_libdir}/libclanRegExp.la
-%{_libdir}/libclanSound.la
-%{_libdir}/libclanSqlite.la
+%attr(755,root,root) %{_libdir}/libclan21App.so
+%attr(755,root,root) %{_libdir}/libclan21Core.so
+%attr(755,root,root) %{_libdir}/libclan21Database.so
+%attr(755,root,root) %{_libdir}/libclan21Display.so
+%attr(755,root,root) %{_libdir}/libclan21GDI.so
+%attr(755,root,root) %{_libdir}/libclan21GUI.so
+%attr(755,root,root) %{_libdir}/libclan21Network.so
+%attr(755,root,root) %{_libdir}/libclan21RegExp.so
+%attr(755,root,root) %{_libdir}/libclan21Sound.so
+%attr(755,root,root) %{_libdir}/libclan21Sqlite.so
+%{_libdir}/libclan21App.la
+%{_libdir}/libclan21Core.la
+%{_libdir}/libclan21Database.la
+%{_libdir}/libclan21Display.la
+%{_libdir}/libclan21GDI.la
+%{_libdir}/libclan21GUI.la
+%{_libdir}/libclan21Network.la
+%{_libdir}/libclan21RegExp.la
+%{_libdir}/libclan21Sound.la
+%{_libdir}/libclan21Sqlite.la
 %dir %{_includedir}/ClanLib-%{cvmajor}
 %dir %{_includedir}/ClanLib-%{cvmajor}/ClanLib
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/App
@@ -399,81 +364,64 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libclanApp.a
-%{_libdir}/libclanCore.a
-%{_libdir}/libclanDatabase.a
-%{_libdir}/libclanDisplay.a
-%{_libdir}/libclanGDI.a
-%{_libdir}/libclanGUI.a
-%{_libdir}/libclanNetwork.a
-%{_libdir}/libclanRegExp.a
-%{_libdir}/libclanSound.a
-%{_libdir}/libclanSqlite.a
+%{_libdir}/libclan21App.a
+%{_libdir}/libclan21Core.a
+%{_libdir}/libclan21Database.a
+%{_libdir}/libclan21Display.a
+%{_libdir}/libclan21GDI.a
+%{_libdir}/libclan21GUI.a
+%{_libdir}/libclan21Network.a
+%{_libdir}/libclan21RegExp.a
+%{_libdir}/libclan21Sound.a
+%{_libdir}/libclan21Sqlite.a
 
 %files OpenGL
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanGL-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGL-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21GL-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21GL-%{cvmajor}.so.1
 
 %files OpenGL-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanGL.so
-%{_libdir}/libclanGL.la
+%attr(755,root,root) %{_libdir}/libclan21GL.so
+%{_libdir}/libclan21GL.la
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/GL
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/gl.h
 %{_pkgconfigdir}/clanGL-%{cvmajor}.pc
 
 %files OpenGL-static
 %defattr(644,root,root,755)
-%{_libdir}/libclanGL.a
+%{_libdir}/libclan21GL.a
 
 %files MikMod
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMikMod-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanMikMod-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21MikMod-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21MikMod-%{cvmajor}.so.1
 
 %files MikMod-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMikMod.so
-%{_libdir}/libclanMikMod.la
+%attr(755,root,root) %{_libdir}/libclan21MikMod.so
+%{_libdir}/libclan21MikMod.la
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/MikMod
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/mikmod.h
 %{_pkgconfigdir}/clanMikMod-%{cvmajor}.pc
 
 %files MikMod-static
 %defattr(644,root,root,755)
-%{_libdir}/libclanMikMod.a
-
-%files SDL
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanSDL-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSDL-%{cvmajor}.so.1
-
-%files SDL-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanSDL.so
-%{_libdir}/libclanSDL.la
-%{_includedir}/ClanLib-%{cvmajor}/ClanLib/SDL
-%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sdl.h
-%{_pkgconfigdir}/clanSDL-%{cvmajor}.pc
-
-%files SDL-static
-%defattr(644,root,root,755)
-%{_libdir}/libclanSDL.a
+%{_libdir}/libclan21MikMod.a
 
 %files Vorbis
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanVorbis-%{cvmajor}.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanVorbis-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan21Vorbis-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan21Vorbis-%{cvmajor}.so.1
 
 %files Vorbis-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanVorbis.so
-%{_libdir}/libclanVorbis.la
+%attr(755,root,root) %{_libdir}/libclan21Vorbis.so
+%{_libdir}/libclan21Vorbis.la
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/Vorbis
 %{_includedir}/ClanLib-%{cvmajor}/ClanLib/vorbis.h
 %{_pkgconfigdir}/clanVorbis-%{cvmajor}.pc
 
 %files Vorbis-static
 %defattr(644,root,root,755)
-%{_libdir}/libclanVorbis.a
+%{_libdir}/libclan21Vorbis.a