- up to 2.0.2

Changed files:
    ClanLib-build.patch -> 1.1
    ClanLib-gcc4.patch -> 1.4
    ClanLib-link.patch -> 1.3
    ClanLib.spec -> 1.109

diff --git a/ClanLib-build.patch b/ClanLib-build.patch
new file mode 100644 (file)
index 0000000..1885cb1
--- /dev/null
+++ b/ClanLib-build.patch
@@ -0,0 +1,86 @@
+--- ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp~  2009-05-15 10:13:14.000000000 +0200
++++ ClanLib-2.0.2/Sources/Display/X11/x11_window.cpp   2009-07-14 08:49:17.643976647 +0200
+@@ -53,6 +53,8 @@
+ #include "timer_provider_x11.h"
+ #include <X11/Xatom.h>
+ 
++#include <cstdio>
++
+ CL_X11Window::CL_X11Window(CL_DisplayMessageQueue_X11 *message_queue)
+ : window(0), window_last_focus(0), cmap(0), allow_resize(false), bpp(0), message_queue(message_queue), fullscreen(false),
+   disp(0), system_cursor(0), hidden_cursor(0), cursor_bitmap(0), 
+--- ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp~   2009-05-14 12:07:59.000000000 +0200
++++ ClanLib-2.0.2/Sources/Display/X11/input_device_provider_x11keyboard.cpp    2009-07-14 08:50:11.947877097 +0200
+@@ -34,6 +34,8 @@
+ #include "API/Core/Text/string_help.h"
+ #include "x11_window.h"
+ 
++#include <cstdio>
++
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_InputDeviceProvider_X11Keyboard construction:
+ 
+--- ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp~       2009-05-14 17:13:42.000000000 +0200
++++ ClanLib-2.0.2/Sources/GL/GLX/opengl_window_provider_glx.cpp        2009-07-14 08:52:13.170573614 +0200
+@@ -49,6 +49,8 @@
+ #include "../opengl_target_provider.h"
+ #include "Display/X11/timer_provider_x11.h"
+ 
++#include <cstdio>
++
+ namespace
+ {
+       class RenderWindowProvider_GLX: public CL_RenderWindowProvider
+--- ClanLib-2.0.2/Sources/Core/Text/string_help.cpp~   2009-03-16 10:34:32.000000000 +0100
++++ ClanLib-2.0.2/Sources/Core/Text/string_help.cpp    2009-07-14 08:56:18.465131510 +0200
+@@ -35,6 +35,7 @@
+ #include <wctype.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <cstdio>
+ #else
+ #include <string.h>
+ #include <tchar.h>
+--- ClanLib-2.0.2/Sources/API/Makefile.am~     2009-05-06 18:09:22.000000000 +0200
++++ ClanLib-2.0.2/Sources/API/Makefile.am      2009-07-14 09:01:28.314442596 +0200
+@@ -322,7 +322,6 @@
+       Display/2D/sprite_description.h \
+       Display/2D/subtexture.h \
+       Display/2D/color.h \
+-      Display/2D/image.h \
+       Display/2D/span_layout.h \
+       Display/Collision/outline_accuracy.h \
+       Display/Collision/outline_provider_bitmap.h \
+--- ClanLib-2.0.2/Examples/Makefile.conf.in~   2009-07-14 12:28:45.199275223 +0200
++++ ClanLib-2.0.2/Examples/Makefile.conf.in    2009-07-14 12:28:58.112848194 +0200
+@@ -5,7 +5,7 @@
+ #
+ 
+ PACKAGES = $(patsubst %,%-@LT_RELEASE@,$(LIBS))
+-CXXFLAGS += `pkg-config --cflags $(PACKAGES)` -pthread
++CXXFLAGS += -I. `pkg-config --cflags $(PACKAGES)` -pthread
+ 
+ #EXAMPLE_BIN contains list of example binaries to build
+ 
+--- ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile~      2009-03-27 11:19:52.000000000 +0100
++++ ClanLib-2.0.2/Documentation/Utilities/ReferenceDocs/Makefile       2009-07-14 12:39:30.959210323 +0200
+@@ -1,7 +1,7 @@
+ EXAMPLE_BIN=ReferenceDocs
+ OBJF = reference_docs.o reference_all_classes.o reference_class.o reference_define.o reference_enum.o reference_function.o reference_grouped_classes.o reference_index.o reference_typedef.o
+ LIBS=clanCore
+-EXTRA_LIBS=-lpthread
++EXTRA_LIBS=-lpthread -L../../../Sources/Core/.libs/
+ 
+ include ../../../Examples/Makefile.conf
+ 
+--- ClanLib-2.0.2/Documentation/Reference/Makefile.am.org      2009-07-14 13:03:55.506979144 +0200
++++ ClanLib-2.0.2/Documentation/Reference/Makefile.am  2009-07-14 13:03:03.129200101 +0200
+@@ -11,7 +11,7 @@
+       mkdir reftest
+       doxygen ./clanlib.doxygen
+       make -C ../Utilities/ReferenceDocs
+-      ../Utilities/ReferenceDocs/ReferenceDocs
++      LD_LIBRARY_PATH=../../Sources/Core/.libs/ ../Utilities/ReferenceDocs/ReferenceDocs
+ 
+ install-html:
+       $(INSTALL) -d $(DESTDIR)$(HTML_PREFIX)

diff --git a/ClanLib-gcc4.patch b/ClanLib-gcc4.patch
deleted file mode 100644 (file)
index 8cd217b..0000000
--- a/ClanLib-gcc4.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp ClanLib-0.8.1.new/Sources/GL/canvas_opengl.cpp
---- ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp 2007-10-21 02:14:01.000000000 +0200
-+++ ClanLib-0.8.1.new/Sources/GL/canvas_opengl.cpp     2009-05-07 10:24:50.134346567 +0200
-@@ -48,6 +48,7 @@
- #include "graphic_context_opengl.h"
- #include "surface_target_opengl.h"
- #include <cstring>
-+#include <cstdio>
- 
- /////////////////////////////////////////////////////////////////////////////
- // CL_Canvas_OpenGL construction:
-diff -urN ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp ClanLib-0.8.1.new/Sources/GL/GLX/input_device_linuxevent.cpp
---- ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp   2007-10-21 02:14:01.000000000 +0200
-+++ ClanLib-0.8.1.new/Sources/GL/GLX/input_device_linuxevent.cpp       2009-05-07 10:27:25.440582028 +0200
-@@ -35,6 +35,7 @@
- #include <iostream>
- #include <errno.h>
- #include <cstring>
-+#include <cstdio>
- 
- #include "API/Core/System/error.h"
- #include "API/Core/System/clanstring.h"
-diff -urN ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp ClanLib-0.8.1.new/Sources/GL/GLX/input_device_xinput.cpp
---- ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp       2007-10-21 02:14:01.000000000 +0200
-+++ ClanLib-0.8.1.new/Sources/GL/GLX/input_device_xinput.cpp   2009-05-07 10:29:01.220572400 +0200
-@@ -29,6 +29,7 @@
- 
- #include <iostream>
- #include <cstring>
-+#include <cstdio>
- #include "API/Core/System/log.h"
- #include "API/Display/input_device.h"
- #include "API/Display/input_event.h"
-diff -urN ClanLib-0.8.1/Sources/GL/opengl.cpp ClanLib-0.8.1.new/Sources/GL/opengl.cpp
---- ClanLib-0.8.1/Sources/GL/opengl.cpp        2006-10-27 03:55:01.000000000 +0200
-+++ ClanLib-0.8.1.new/Sources/GL/opengl.cpp    2009-05-07 10:25:50.247258791 +0200
-@@ -27,6 +27,8 @@
- **    (if your name is missing here, please add it)
- */
- 
-+#include <cstring>
-+
- #include "Display/display_precomp.h"
- #include "API/GL/opengl.h"
- #include "API/GL/opengl_wrap.h"

diff --git a/ClanLib-link.patch b/ClanLib-link.patch
deleted file mode 100644 (file)
index 6eb48c4..0000000
--- a/ClanLib-link.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- ClanLib-0.7.4/Sources/Application/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Application/Makefile.am      2003-10-09 23:15:08.843198880 +0200
-@@ -6,6 +6,7 @@
- libclanApp_la_SOURCES = Unix/clanapp.cpp
- endif
- 
-+libclanApp_la_LIBADD = ../Core/libclanCore.la
- libclanApp_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.8/Sources/Display/Makefile.am.orig     2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.8/Sources/Display/Makefile.am  2003-10-09 23:16:41.208157272 +0200
-@@ -3,7 +3,7 @@
- # FIXME: This needs to be @LIBS@ or @X11LIBS@ or something like that
- if WIN32
- else
--libclanDisplay_la_LIBADD = -L/usr/X11R6/lib/ -lX11 -lXmu -lGL -lGLU -lpng -ljpeg -lXxf86vm @X_LIBS@
-+libclanDisplay_la_LIBADD = -lX11 -lpng -ljpeg -lXxf86vm @X_LIBS@ ../Core/libclanCore.la
- endif
- 
- libclanDisplay_la_SOURCES = \
---- ClanLib-0.8.0-RC1/Sources/GL/Makefile.am.orig      2005-02-11 15:13:43.000000000 +0100
-+++ ClanLib-0.8.0-RC1/Sources/GL/Makefile.am   2006-01-25 23:38:11.091887750 +0100
-@@ -51,7 +51,7 @@
- GLX/input_device_x11keyboard.h \
- GLX/input_device_xinput.cpp \
- GLX/input_device_xinput.h
--libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL 
-+libclanGL_la_LIBADD = -lXxf86vm -lXi -lGLU -lGL ../Display/libclanDisplay.la
- endif
- 
- EXTRA_DIST = \
---- ClanLib-0.7.4/Sources/GUI/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/GUI/Makefile.am      2003-10-09 23:19:13.152058288 +0200
-@@ -82,6 +82,8 @@
- filedialog.cpp \
- window_generic.h
- 
-+libclanGUI_la_LIBADD = ../Display/libclanDisplay.la
-+
- libclanGUI_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am.orig      2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/GUIStyleSilver/Makefile.am   2003-10-09 23:21:06.631806744 +0200
-@@ -10,6 +10,7 @@
- image_silver.h     progressbar_silver.h  window_silver.h \
- inputbox_silver.h  radiobutton_silver.h
- 
-+libclanGUIStyleSilver_la_LIBADD = ../GUI/libclanGUI.la
- libclanGUIStyleSilver_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/MikMod/Makefile.am.orig      2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/MikMod/Makefile.am   2003-10-09 23:24:59.453412480 +0200
-@@ -8,7 +8,7 @@
-  soundprovider_mikmod.cpp   \
-  soundprovider_mikmod_session.cpp
- 
--libclanMikMod_la_LIBADD = -lmikmod
-+libclanMikMod_la_LIBADD = -lmikmod ../Sound/libclanSound.la
- 
- libclanMikMod_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
---- ClanLib-0.7.4/Sources/Network/Makefile.am.orig     2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Network/Makefile.am  2003-10-09 23:25:43.592702288 +0200
-@@ -69,6 +69,7 @@
- libclanNetwork_la_SOURCES += setupnetwork_unix.cpp
- endif
- 
-+libclanNetwork_la_LIBADD = ../Core/libclanCore.la
- libclanNetwork_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/SDL/Makefile.am.orig 2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/SDL/Makefile.am      2003-10-09 23:26:23.644613472 +0200
-@@ -20,7 +20,7 @@
- surface_sdl.h
- 
- libclanSDL_la_CXXFLAGS = $(SDL_CFLAGS)
--libclanSDL_la_LIBADD   = $(SDL_LIBS)
-+libclanSDL_la_LIBADD   = $(SDL_LIBS) ../Display/libclanDisplay.la
- 
- libclanSDL_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
---- ClanLib-0.7.4/Sources/Sound/Makefile.am.orig       2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Sound/Makefile.am    2003-10-09 23:27:44.491322904 +0200
-@@ -36,6 +36,7 @@
- Unix/soundoutput_oss.h
- endif
- 
-+libclanSound_la_LIBADD = ../Core/libclanCore.la
- libclanSound_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
-   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
---- ClanLib-0.7.4/Sources/Vorbis/Makefile.am.orig      2003-09-15 16:18:50.000000000 +0200
-+++ ClanLib-0.7.4/Sources/Vorbis/Makefile.am   2003-10-09 23:28:39.064026592 +0200
-@@ -5,7 +5,7 @@
-       soundprovider_vorbis.cpp \
-       soundprovider_vorbis_session.cpp
- 
--libclanVorbis_la_LIBADD = -logg -lvorbis
-+libclanVorbis_la_LIBADD = -logg -lvorbis ../Sound/libclanSound.la
- 
- libclanVorbis_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
---- ClanLib-0.8.0-RC1/Sources/Core/Makefile.am.orig    2005-07-10 01:25:31.000000000 +0200
-+++ ClanLib-0.8.0-RC1/Sources/Core/Makefile.am 2006-01-26 21:57:59.647858500 +0100
-@@ -125,7 +125,7 @@
- endif
- 
- # FIXME: Hardcoding these here might not be a good idea
--libclanCore_la_LIBADD = @LIBPTHREAD@
-+libclanCore_la_LIBADD = @LIBPTHREAD@ ../Signals/libclanSignals.la -ldl
- 
- libclanCore_la_LDFLAGS = \
-   -release $(LT_RELEASE) \
---- ClanLib-0.8.0-RC1/configure.ac.orig        2005-10-20 22:57:15.000000000 +0200
-+++ ClanLib-0.8.0-RC1/configure.ac     2006-01-26 18:13:46.567093500 +0100
-@@ -422,16 +422,15 @@
- CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/Sources"
- 
- # Modules which will be build
--ClanLib_Modules="Application"
--ClanLib_pkgconfig="clanApp.pc"
-+ClanLib_Modules="Signals Core Application"
-+ClanLib_pkgconfig="clanSignals.pc clanCore.pc clanApp.pc"
- 
- # API header files for the Modules which will be installed
--ClanLib_API_Modules="$ClanLib_API_Modules \$(clanApp_includes)"
-+ClanLib_API_Modules="$ClanLib_API_Modules \$(clanSignals_includes) \$(clanCore_includes) \$(clanApp_includes)"
- 
- # Default examples which will be build
- ClanLib_Examples="Directory Minimum Resources ResourcesCustom Signals ThreadSync XML Zip"
- 
--CLANLIB_ENABLE_MODULES([Core Signals])
- 
- if test "$enable_clanDisplay" = "yes"; then
-     CLANLIB_ENABLE_MODULES(Display)
-@@ -625,6 +624,8 @@
- AC_SUBST(ClanLib_Examples)
- 
- AC_CONFIG_FILES([
-+        pkgconfig/clanSignals.pc
-+        pkgconfig/clanCore.pc
-         pkgconfig/clanApp.pc
-         pkgconfig/Makefile
-         Makefile
-@@ -632,6 +633,8 @@
-         Examples/Makefile.conf
-         Setup/Makefile
-         Sources/API/Makefile
-+        Sources/Signals/Makefile
-+        Sources/Core/Makefile
-         Sources/Application/Makefile
-         Sources/Makefile
-         Tests/Makefile.conf

diff --git a/ClanLib.spec b/ClanLib.spec
index 2ebb8a89d1e69f19fc43c9823b76e3f4d29f8539..796e821d288e480da2c83007d03efde557e7a3db 100644 (file)
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -1,16 +1,16 @@
+%define        cvmajor 2.0
 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:       0.8.1
-Release:       5
+Version:       2.0.2
+Release:       1
 License:       BSD-like (see COPYING)
 Group:         Libraries
 #Source0Download: http://www.clanlib.org/download.html
-Source0:       http://www.clanlib.org/download/releases-0.8/%{name}-%{version}.tgz
-# Source0-md5: 24e86202eb6d702f788ff16a2718aa97
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-gcc4.patch
+Source0:       http://www.clanlib.org/download/releases-2.0/%{name}-%{version}.tgz
+# Source0-md5: 81a9e30e035fbb73a698813f67289505
+Patch0:                %{name}-build.patch
 URL:           http://www.clanlib.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: SDL >= 1.2.0
@@ -20,13 +20,14 @@ BuildRequires:      autoconf >= 2.59-9
 BuildRequires: automake >= 1.6
 BuildRequires: libjpeg-devel
 BuildRequires: libmikmod-devel
-BuildRequires: libpng-devel >= 1.0.8
+BuildRequires: libpng-devel >= 1.%{cvmajor}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.4d-3
 BuildRequires: libvorbis-devel >= 1:1.0
 BuildRequires: libxslt-progs
 BuildRequires: perl-base
 BuildRequires: pkgconfig
+BuildRequires: sqlite3-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXxf86vm-devel
 Obsoletes:     ClanLib-TTF
@@ -257,7 +258,6 @@ Statyczna biblioteka Vorbis dla ClanLiba.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 rm -rf autom4te.cache
 echo "dnl" >> acinclude.m4
@@ -271,19 +271,23 @@ echo "dnl" >> acinclude.m4
 %configure \
        --enable-static \
        --enable-shared \
-       --%{?debug:en}%{!?debug:dis}able-debug \
+       --enable-docs \
 %ifarch %{ix86}
        --enable-asm386 \
 %endif
-       --enable-dyn
+       --%{?debug:en}%{!?debug:dis}able-debug
 # directfb disabled now
 
 %{__make}
 
+(cd Documentation/Utilities/ReferenceDocs; ln -s ../../../Sources/API ClanLib)
+export PKG_CONFIG_PATH=$(pwd)/Setup/pkgconfig
+%{__make} html
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} install install-html \
        DESTDIR=$RPM_BUILD_ROOT
 
 # missing from make install
@@ -310,95 +314,114 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING CREDITS NEWS README README.sdl TODO-RSN
-%attr(755,root,root) %{_libdir}/libclanApp-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanApp-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanCore-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanCore-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanDisplay-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanDisplay-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanGUI-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGUI-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanGUIStyleSilver-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGUIStyleSilver-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanNetwork-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanNetwork-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanSignals-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSignals-0.8.so.1
-%attr(755,root,root) %{_libdir}/libclanSound-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSound-0.8.so.1
+%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
 
 %files devel
 %defattr(644,root,root,755)
-%doc README.kdevelop README.upgrade
+%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}/libclanGUIStyleSilver.so
 %attr(755,root,root) %{_libdir}/libclanNetwork.so
-%attr(755,root,root) %{_libdir}/libclanSignals.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}/libclanGUIStyleSilver.la
 %{_libdir}/libclanNetwork.la
-%{_libdir}/libclanSignals.la
+%{_libdir}/libclanRegExp.la
 %{_libdir}/libclanSound.la
-%dir %{_includedir}/ClanLib-0.8
-%dir %{_includedir}/ClanLib-0.8/ClanLib
-%{_includedir}/ClanLib-0.8/ClanLib/Application
-%{_includedir}/ClanLib-0.8/ClanLib/application.h
-%{_includedir}/ClanLib-0.8/ClanLib/Core
-%{_includedir}/ClanLib-0.8/ClanLib/core.h
-%{_includedir}/ClanLib-0.8/ClanLib/Display
-%{_includedir}/ClanLib-0.8/ClanLib/display.h
-%{_includedir}/ClanLib-0.8/ClanLib/GUI*
-%{_includedir}/ClanLib-0.8/ClanLib/gui*.h
-%{_includedir}/ClanLib-0.8/ClanLib/Network
-%{_includedir}/ClanLib-0.8/ClanLib/network.h
-%{_includedir}/ClanLib-0.8/ClanLib/Signals
-%{_includedir}/ClanLib-0.8/ClanLib/signals.h
-%{_includedir}/ClanLib-0.8/ClanLib/Sound
-%{_includedir}/ClanLib-0.8/ClanLib/sound.h
+%{_libdir}/libclanSqlite.la
+%dir %{_includedir}/ClanLib-%{cvmajor}
+%dir %{_includedir}/ClanLib-%{cvmajor}/ClanLib
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/App
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/application.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Core
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/core.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Database
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/database.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Display
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/display.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GDI
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gdi.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GUI*
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gui*.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Network
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/network.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/RegExp
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/regexp.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Sound
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sound.h
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Sqlite
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sqlite.h
 %{_aclocaldir}/*.m4
-%{_pkgconfigdir}/clanApp-0.8.pc
-%{_pkgconfigdir}/clanCore-0.8.pc
-%{_pkgconfigdir}/clanDisplay-0.8.pc
-%{_pkgconfigdir}/clanGUI*-0.8.pc
-%{_pkgconfigdir}/clanNetwork-0.8.pc
-%{_pkgconfigdir}/clanSignals-0.8.pc
-%{_pkgconfigdir}/clanSound-0.8.pc
+%{_pkgconfigdir}/clanApp-%{cvmajor}.pc
+%{_pkgconfigdir}/clanCore-%{cvmajor}.pc
+%{_pkgconfigdir}/clanDatabase-%{cvmajor}.pc
+%{_pkgconfigdir}/clanDisplay-%{cvmajor}.pc
+%{_pkgconfigdir}/clanGDI-%{cvmajor}.pc
+%{_pkgconfigdir}/clanGUI*-%{cvmajor}.pc
+%{_pkgconfigdir}/clanNetwork-%{cvmajor}.pc
+%{_pkgconfigdir}/clanRegExp-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSound-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSqlite-%{cvmajor}.pc
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/clanlib
+%{_docdir}/clanlib-*
 
 %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}/libclanGUIStyleSilver.a
 %{_libdir}/libclanNetwork.a
-%{_libdir}/libclanSignals.a
+%{_libdir}/libclanRegExp.a
 %{_libdir}/libclanSound.a
+%{_libdir}/libclanSqlite.a
 
 %files OpenGL
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanGL-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanGL-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanGL-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanGL-%{cvmajor}.so.1
 
 %files OpenGL-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanGL.so
 %{_libdir}/libclanGL.la
-%{_includedir}/ClanLib-0.8/ClanLib/GL
-%{_includedir}/ClanLib-0.8/ClanLib/gl.h
-%{_pkgconfigdir}/clanGL-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GL
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gl.h
+%{_pkgconfigdir}/clanGL-%{cvmajor}.pc
 
 %files OpenGL-static
 %defattr(644,root,root,755)
@@ -406,16 +429,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files MikMod
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMikMod-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanMikMod-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanMikMod-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanMikMod-%{cvmajor}.so.1
 
 %files MikMod-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanMikMod.so
 %{_libdir}/libclanMikMod.la
-%{_includedir}/ClanLib-0.8/ClanLib/MikMod
-%{_includedir}/ClanLib-0.8/ClanLib/mikmod.h
-%{_pkgconfigdir}/clanMikMod-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/MikMod
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/mikmod.h
+%{_pkgconfigdir}/clanMikMod-%{cvmajor}.pc
 
 %files MikMod-static
 %defattr(644,root,root,755)
@@ -423,16 +446,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files SDL
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanSDL-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanSDL-0.8.so.1
+%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-0.8/ClanLib/SDL
-%{_includedir}/ClanLib-0.8/ClanLib/sdl.h
-%{_pkgconfigdir}/clanSDL-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/SDL
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/sdl.h
+%{_pkgconfigdir}/clanSDL-%{cvmajor}.pc
 
 %files SDL-static
 %defattr(644,root,root,755)
@@ -440,16 +463,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files Vorbis
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanVorbis-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libclanVorbis-0.8.so.1
+%attr(755,root,root) %{_libdir}/libclanVorbis-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclanVorbis-%{cvmajor}.so.1
 
 %files Vorbis-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanVorbis.so
 %{_libdir}/libclanVorbis.la
-%{_includedir}/ClanLib-0.8/ClanLib/Vorbis
-%{_includedir}/ClanLib-0.8/ClanLib/vorbis.h
-%{_pkgconfigdir}/clanVorbis-0.8.pc
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Vorbis
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/vorbis.h
+%{_pkgconfigdir}/clanVorbis-%{cvmajor}.pc
 
 %files Vorbis-static
 %defattr(644,root,root,755)