X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ClanLib.spec;h=78a3a3781c35c105236742c2f117454ed34ba3c0;hb=82c2f28355ea4b487c77e18241187f301939bcf9;hp=6806c66d3c090561e21f94a43321dd696e6f244d;hpb=a52a1ea113d0fb85a24b069925b57c06a4ceb500;p=packages%2FClanLib.git

diff --git a/ClanLib.spec b/ClanLib.spec
index 6806c66..78a3a37 100644
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -1,241 +1,490 @@
-Summary:	ClanLib, the platform independent game SDK.
-Summary(pl):	ClanLib, niezale¿ny od platformy SDK do gier
+%define	cvmajor	2.2
+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.4.3
+Version:	2.2.2
 Release:	1
-Copyright:	LGPL
+License:	BSD-like (see COPYING)
 Group:		Libraries
-Group(pl):	Biblioteki
-Source:		http://dark.x.dtu.dk/clansoft/clanlib/download/%{name}-%{version}.tar.gz
-URL:		http://clanlib.org
-Requires:	Hermes >= 1.3.1
-BuildRequires:	libpng-devel
-BuildRequires:	zlib-devel
-BuildRequires:	Hermes-devel >= 1.3.1
-BuildRequires:	libstdc++-devel
-BuildRequires:	XFree86-devel
-BuildRequires:	svgalib-devel
-BuildRequires:	Mesa-devel
-BuildRequires:	ImageMagick-devel
+#Source0Download: http://www.clanlib.org/download.html
+Source0:	http://www.clanlib.org/download/releases-2.0/%{name}-%{version}.tgz
+# Source0-md5:	2271de881623b2c2a113287f52b8d0b7
+Patch0:		%{name}-build.patch
+URL:		http://www.clanlib.org/
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	alsa-lib-devel
+BuildRequires:	autoconf >= 2.59-9
+BuildRequires:	automake >= 1.6
+BuildRequires:	doxygen
+BuildRequires:	fontconfig-devel
+BuildRequires:	freetype-devel
+BuildRequires:	libjpeg-devel
 BuildRequires:	libmikmod-devel
-BuildRequires:	libpng-devel
-BuildRequires:	perl
+BuildRequires:	libpng-devel >= 1.%{cvmajor}
+BuildRequires:	libstdc++-devel
+BuildRequires:	libtool >= 2:1.4d-3
+BuildRequires:	libvorbis-devel >= 1:1.0
+BuildRequires:	libxslt-progs
+BuildRequires:	pcre-devel
+BuildRequires:	perl-base
+BuildRequires:	pkgconfig
+BuildRequires:	sqlite3-devel
+BuildRequires:	xorg-lib-libXi-devel
+BuildRequires:	xorg-lib-libXxf86vm-devel
+Obsoletes:	ClanLib-SDL
+Obsoletes:	ClanLib-TTF
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
-The ClanLib SDK is designed to provide an platform independent game SDK using
-a lot cleaner (and object oriented) interface than the traditional way it is
-done in DirectX, SDL and such. The goals is to avoid game developers
-constantly reinventing the wheel by providing smarter ways to eg. load
-surfaces.
+%define 	_noautoreqdep	libGL.so.1 libGLU.so.1
 
-%description -l pl
-ClanLib SDK jest projektowany jako niezale¿ny od platformy SDK dla gier.
-Stosuje prosty (i zorientowany obiektowo) interfejs, przejrzystszy ni¿
-DirectX, SDL i inne.
+%description
+The ClanLib SDK is designed to provide an platform independent game
+SDK using a lot cleaner (and object oriented) interface than the
+traditional way it is done in DirectX, SDL and such. The goal is to
+avoid game developers constantly reinventing the wheel by providing
+smarter ways to eg. load surfaces.
+
+%description -l pl.UTF-8
+ClanLib SDK jest projektowany jako niezależny od platformy SDK dla
+gier. Stosuje prosty (i zorientowany obiektowo) interfejs,
+przejrzystszy niż DirectX, SDL i inne.
+
+%description -l pt_BR.UTF-8
+A Clanlib é uma biblioteca de jogos multi-plataforma desenhada para
+facilitar o trabalho dos desenvolvedores. A idéia principal é fornecer
+uma interface comum para os problemas clássicos dos jogos (carregar
+gráficos por exemplo).
 
 %package devel
 Summary:	ClanLib development package
-Summary(pl):	pakiet programistyczny dla ClanLib
+Summary(pl.UTF-8):	Pakiet programistyczny dla ClanLib
+Summary(pt_BR.UTF-8):	Arquivos para desenvolvimento usando a Clanlib
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
-Requires:	%{name}-OpenGL = %{version}
-Requires:	%{name}-MikMod = %{version}
-Requires:	%{name}-Magick = %{version}
+Requires:	%{name} = %{version}-%{release}
+Requires:	libstdc++-devel
+# for libclanDisplay
+Requires:	xorg-lib-libXxf86vm-devel
+Obsoletes:	ClanLib-SDL-devel
+Obsoletes:	ClanLib-TTF-devel
 
 %description devel
-This is the development add-on package that includes the header files needed
-to compile new ClanLib applications.
+This is the development add-on package that includes the header files
+needed to compile new ClanLib applications.
+
+%description devel -l pl.UTF-8
+Programistyczne dodatki do ClanLiba, zawierają pliki nagłówkowe
+potrzebne do kompilacji programów korzystających z ClanLib.
 
-%description -l pl devel
-Programistyczne dodatki do ClanLib-a, zawieraj± pliki nag³ówkowe potrzebne
-do kompilacji programów korzystaj±cych z ClanLib.
+%description devel -l pt_BR.UTF-8
+Arquivos que possibilitam o desenvolvimento de aplicativos utilizando
+a biblioteca Clanlib.
 
-%package svgalib
-Summary:	svgalib target for ClanLib
-Summary(pl):	obs³uga svgalib dla ClanLib
+%package static
+Summary:	ClanLib static libraries
+Summary(pl.UTF-8):	Statyczne biblioteki ClanLib
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	ClanLib-SDL-static
+Obsoletes:	ClanLib-TTF-static
+
+%description static
+This package contains static versions of ClanLib libraries.
+
+%description static -l pl.UTF-8
+Ten pakiet zawiera statyczne wersje bibliotek ClanLib.
 
-%description svgalib
-This is the svgalib target for ClanLib. 
+%package doc
+Summary:	ClanLib reference documentation for programmers
+Summary(pl.UTF-8):	Dokumentacja programisty do biblioteki ClanLib
+Group:		Documentation
 
-%description -l pl svgalib
-Obs³uga svgalib dla ClanLib-a.
+%description doc
+ClanLib reference documentation for programmers.
+
+%description doc -l pl.UTF-8
+Dokumentacja programisty do biblioteki ClanLib
 
 %package OpenGL
-Summary:	OpenGL target for ClanLib
-Summary(pl):	obs³uga OpenGL dla ClanLib
-Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Summary:	OpenGL ClanLib library
+Summary(pl.UTF-8):	Biblioteka OpenGL dla ClanLiba
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description OpenGL
-This is the OpenGL target for ClanLib. 
+OpenGL ClanLib library.
 
-%description -l pl OpenGL
-Obs³uga OpenGL dla ClanLib-a.
+%description OpenGL -l pl.UTF-8
+Biblioteka OpenGL dla ClanLiba.
 
-%package X11
-Summary:	X11 target for ClanLib
-Summary(pl):	obs³uga X11 dla ClanLib
+%package OpenGL-devel
+Summary:	Header files for OpenGL ClanLib library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki OpenGL dla ClanLiba
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name}-OpenGL = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	OpenGL-GLU-devel
+Requires:	xorg-lib-libXi-devel
+Requires:	xorg-lib-libXxf86vm-devel
 
-%description X11
-This is the X11 target for ClanLib. 
+%description OpenGL-devel
+Header files for OpenGL ClanLib library.
 
-%description -l pl X11
-Obs³uga X11 dla ClanLib-a.
+%description OpenGL-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki OpenGL dla ClanLiba.
 
-%package Magick
-Summary:	ImageMagick module for ClanLib
-Summary(pl):	Modu³ ImageMagick dla ClanLib
+%package OpenGL-static
+Summary:	Static OpenGL ClanLib library
+Summary(pl.UTF-8):	Statyczna biblioteka OpenGL dla ClanLiba
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name}-OpenGL-devel = %{version}-%{release}
 
-%description Magick
-This is the ImageMagic add-on package for ClanLib. It provides support to most
-known graphics file-formats.
+%description OpenGL-static
+Static OpenGL ClanLib library.
 
-%description -l pl Magick
-Pozwala na obs³ugê praktycznie dowolnych formatów plików graficznych przez
-aplikacje ClanLib poprzez biblioteki ImageMagic-a.
+%description OpenGL-static -l pl.UTF-8
+Statyczna biblioteka OpenGL dla ClanLiba.
 
-%package MikMod
-Summary:	MikMod module for ClanLib
-Summary(pl):	Modu³ Mikmod dla ClanLib
+%package OpenGL1
+Summary:	OpenGL1 ClanLib library
+Summary(pl.UTF-8):	Biblioteka OpenGL1 dla ClanLiba
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description OpenGL1
+OpenGL1 ClanLib library.
+
+%description OpenGL1 -l pl.UTF-8
+Biblioteka OpenGL1 dla ClanLiba.
+
+%package OpenGL1-devel
+Summary:	Header files for OpenGL1 ClanLib library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki OpenGL1 dla ClanLiba
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
+Requires:	%{name}-OpenGL1 = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	OpenGL-GLU-devel
+Requires:	xorg-lib-libXi-devel
+Requires:	xorg-lib-libXxf86vm-devel
+
+%description OpenGL1-devel
+Header files for OpenGL1 ClanLib library.
+
+%description OpenGL1-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki OpenGL1 dla ClanLiba.
+
+%package OpenGL1-static
+Summary:	Static OpenGL1 ClanLib library
+Summary(pl.UTF-8):	Statyczna biblioteka OpenGL1 dla ClanLiba
+Group:		Development/Libraries
+Requires:	%{name}-OpenGL1-devel = %{version}-%{release}
+
+%description OpenGL1-static
+Static OpenGL1 ClanLib library.
+
+%description OpenGL1-static -l pl.UTF-8
+Statyczna biblioteka OpenGL1 dla ClanLiba.
+
+%package MikMod
+Summary:	MikMod ClanLib library
+Summary(pl.UTF-8):	Biblioteka MikMod dla ClanLiba
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
 
 %description MikMod
-MikMod module for ClanLib
+MikMod ClanLib library.
 
-%description -l pl MikMod
-Modu³ Mikmod dla ClanLib
+%description MikMod -l pl.UTF-8
+Biblioteka MikMod dla ClanLiba.
 
-%package static
-Summary:	ClanLib development package
-Summary(pl):	pakiet programistyczny dla ClanLib
+%package MikMod-devel
+Summary:	Header files for MikMod ClanLib library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki MikMod dla ClanLiba
 Group:		Development/Libraries
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-MikMod = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	libmikmod-devel
 
-%description static
-This is the development add-on package that includes the header files needed
-to compile new ClanLib applications.
+%description MikMod-devel
+Header files for MikMod ClanLib library.
+
+%description MikMod-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki MikMod dla ClanLiba.
+
+%package MikMod-static
+Summary:	Static MikMod ClanLib library
+Summary(pl.UTF-8):	Statyczna biblioteka MikMod dla ClanLiba
+Group:		Development/Libraries
+Requires:	%{name}-MikMod-devel = %{version}-%{release}
+
+%description MikMod-static
+Static MikMod ClanLib library.
+
+%description MikMod-static -l pl.UTF-8
+Statyczna biblioteka MikMod dla ClanLiba.
+
+%package Vorbis
+Summary:	Vorbis ClanLib library
+Summary(pl.UTF-8):	Biblioteka Vorbis dla ClanLiba
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description Vorbis
+Vorbis ClanLib library.
+
+%description Vorbis -l pl.UTF-8
+Biblioteka Vorbis dla ClanLiba.
+
+%package Vorbis-devel
+Summary:	Header files for Vorbis ClanLib library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Vorbis dla ClanLiba
+Group:		Development/Libraries
+Requires:	%{name}-Vorbis = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
+Requires:	libvorbis-devel
+
+%description Vorbis-devel
+Header files for Vorbis ClanLib library.
+
+%description Vorbis-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki Vorbis dla ClanLiba.
+
+%package Vorbis-static
+Summary:	Static Vorbis ClanLib library
+Summary(pl.UTF-8):	Statyczna biblioteka Vorbis dla ClanLiba
+Group:		Development/Libraries
+Requires:	%{name}-Vorbis-devel = %{version}-%{release}
 
-%description -l pl static
-Programistyczne dodatki do ClanLib-a, zawieraj± pliki nag³ówkowe potrzebne
-do kompilacji programów korzystaj±cych z CleanLib.
+%description Vorbis-static
+Static Vorbis ClanLib library.
+
+%description Vorbis-static -l pl.UTF-8
+Statyczna biblioteka Vorbis dla ClanLiba.
 
 %prep
 %setup -q
+%patch0 -p1
+
+rm -rf autom4te.cache
+echo "dnl" >> acinclude.m4
 
 %build
-./autogen.sh
-LDFLAGS="-s"; export LDFLAGS
+# note: rtti is needed --- ClanLib uses exceptions!
+%{__libtoolize}
+%{__aclocal}
+%{__automake}
+%{__autoconf}
 %configure \
 	--enable-static \
 	--enable-shared \
-	--enable-x11 \
-	--enable-fbdev \
-	--disable-ggi \
-	--enable-opengl \
-	--enable-svgalib \
-	--disable-ptc \
-	--enable-vidmode \
-	--enable-clansound \
-	--enable-network \
-	--enable-dyn
-make
-make clanGL
-make clanMikMod
-make clanMagick
-make clanPNG
-make clanMPEG
-make clanGUI
-make docs
+	--enable-docs \
+	--%{?debug:en}%{!?debug:dis}able-debug
+# directfb disabled now
+
+export PKG_CONFIG_PATH=$(pwd)/Setup/pkgconfig
+%{__make}
+
+(cd Documentation/Utilities/ReferenceDocs; ln -s ../../../Sources/API ClanLib)
+%{__make} html \
+	PKG_CONFIG_PATH=$(pwd)/Setup/pkgconfig
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make 	install \
-	LIB_PREFIX="$RPM_BUILD_ROOT%{_libdir}" \
-	TARGET_PREFIX="$RPM_BUILD_ROOT%{_libdir}/ClanLib" \
-	BIN_PREFIX="$RPM_BUILD_ROOT%{_bindir}" \
-	INC_PREFIX="$RPM_BUILD_ROOT%{_includedir}"
 
-make docs_install \
-	MAN_PREFIX="$RPM_BUILD_ROOT%{_mandir}" \
-	HTML_PREFIX="`pwd`/html"
+%{__make} install install-html \
+	DESTDIR=$RPM_BUILD_ROOT
 
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/lib*.so*
-strip --strip-unneeded $RPM_BUILD_ROOT%{_libdir}/ClanLib/lib*.so*
+# missing from make install
+install -d $RPM_BUILD_ROOT%{_aclocaldir}
+install Setup/Unix/clanlib.m4 $RPM_BUILD_ROOT%{_aclocaldir}
 
-gzip -9nf README CREDITS FAQ $RPM_BUILD_ROOT%{_mandir}/man?/* || : 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
-%post   OpenGL -p /sbin/ldconfig
-%postun OpenGL -p /sbin/ldconfig
+%post	OpenGL -p /sbin/ldconfig
+%postun	OpenGL -p /sbin/ldconfig
 
-%post   MikMod -p /sbin/ldconfig
-%postun MikMod -p /sbin/ldconfig
+%post   OpenGL1 -p /sbin/ldconfig
+%postun OpenGL1 -p /sbin/ldconfig
 
-%post   Magick -p /sbin/ldconfig
-%postun Magick -p /sbin/ldconfig
+%post	MikMod -p /sbin/ldconfig
+%postun	MikMod -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post	Vorbis -p /sbin/ldconfig
+%postun	Vorbis -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanCore.so.*.*
-%attr(755,root,root) %{_libdir}/libclanGUI.so.*.*
-%attr(755,root,root) %{_libdir}/libclanMPEG.so.*.*
-%attr(755,root,root) %{_libdir}/libclanPNG.so.*.*
-%dir %{_libdir}/ClanLib
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-display-fbdev.so*
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-input-tty.so*
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-network.so*
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-sound.so*
+%doc COPYING CREDITS README
+%attr(755,root,root) %{_libdir}/libclan22App-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22App-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22Core-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22CSSLayout-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22CSSLayout-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Core-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22Database-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Database-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22Display-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Display-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22GUI-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22GUI-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22Network-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Network-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22RegExp-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22RegExp-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22SWRender-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22SWRender-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22Sound-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Sound-%{cvmajor}.so.1
+%attr(755,root,root) %{_libdir}/libclan22Sqlite-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Sqlite-%{cvmajor}.so.1
 
-%files X11
+%files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-display-x11.so*
+%attr(755,root,root) %{_libdir}/libclan22App.so
+%attr(755,root,root) %{_libdir}/libclan22CSSLayout.so
+%attr(755,root,root) %{_libdir}/libclan22Core.so
+%attr(755,root,root) %{_libdir}/libclan22Database.so
+%attr(755,root,root) %{_libdir}/libclan22Display.so
+%attr(755,root,root) %{_libdir}/libclan22GUI.so
+%attr(755,root,root) %{_libdir}/libclan22Network.so
+%attr(755,root,root) %{_libdir}/libclan22RegExp.so
+%attr(755,root,root) %{_libdir}/libclan22SWRender.so
+%attr(755,root,root) %{_libdir}/libclan22Sound.so
+%attr(755,root,root) %{_libdir}/libclan22Sqlite.so
+%{_libdir}/libclan22App.la
+%{_libdir}/libclan22CSSLayout.la
+%{_libdir}/libclan22Core.la
+%{_libdir}/libclan22Database.la
+%{_libdir}/libclan22Display.la
+%{_libdir}/libclan22GUI.la
+%{_libdir}/libclan22Network.la
+%{_libdir}/libclan22RegExp.la
+%{_libdir}/libclan22SWRender.la
+%{_libdir}/libclan22Sound.la
+%{_libdir}/libclan22Sqlite.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/CSSLayout
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/csslayout.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/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/SWRender
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/swrender.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-%{cvmajor}.pc
+%{_pkgconfigdir}/clanCSSLayout-%{cvmajor}.pc
+%{_pkgconfigdir}/clanCore-%{cvmajor}.pc
+%{_pkgconfigdir}/clanDatabase-%{cvmajor}.pc
+%{_pkgconfigdir}/clanDisplay-%{cvmajor}.pc
+%{_pkgconfigdir}/clanGUI*-%{cvmajor}.pc
+%{_pkgconfigdir}/clanNetwork-%{cvmajor}.pc
+%{_pkgconfigdir}/clanRegExp-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSWRender-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSound-%{cvmajor}.pc
+%{_pkgconfigdir}/clanSqlite-%{cvmajor}.pc
+
+%files doc
+%defattr(644,root,root,755)
+%{_docdir}/clanlib-*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libclan22App.a
+%{_libdir}/libclan22CSSLayout.a
+%{_libdir}/libclan22Core.a
+%{_libdir}/libclan22Database.a
+%{_libdir}/libclan22Display.a
+%{_libdir}/libclan22GUI.a
+%{_libdir}/libclan22Network.a
+%{_libdir}/libclan22RegExp.a
+%{_libdir}/libclan22SWRender.a
+%{_libdir}/libclan22Sound.a
+%{_libdir}/libclan22Sqlite.a
 
 %files OpenGL
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanGL.so.*.*
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-display-glx.so*
+%attr(755,root,root) %{_libdir}/libclan22GL-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22GL-%{cvmajor}.so.1
+
+%files OpenGL-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libclan22GL.so
+%{_libdir}/libclan22GL.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}/libclan22GL.a
+
+%files OpenGL1
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libclan22GL1-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22GL1-%{cvmajor}.so.1
 
-%files svgalib
+%files OpenGL1-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/ClanLib/libclan-display-svgalib.so*
+%attr(755,root,root) %{_libdir}/libclan22GL1.so
+%{_libdir}/libclan22GL1.la
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/GL1
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/gl1.h
+%{_pkgconfigdir}/clanGL1-%{cvmajor}.pc
 
-%files Magick
+%files OpenGL1-static
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMagick.so.*.*
+%{_libdir}/libclan22GL1.a
 
 %files MikMod
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libclanMikMod.so.*.*
+%attr(755,root,root) %{_libdir}/libclan22MikMod-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22MikMod-%{cvmajor}.so.1
 
-%files devel
+%files MikMod-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libclan22MikMod.so
+%{_libdir}/libclan22MikMod.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}/libclan22MikMod.a
+
+%files Vorbis
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libclan22Vorbis-%{cvmajor}.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libclan22Vorbis-%{cvmajor}.so.1
+
+%files Vorbis-devel
 %defattr(644,root,root,755)
-%doc *gz
-%doc html
-%{_mandir}/man?/*
-%attr(755,root,root) %{_libdir}/*.so
-%attr(755,root,root) %{_bindir}/*
-%{_includedir}/ClanLib
+%attr(755,root,root) %{_libdir}/libclan22Vorbis.so
+%{_libdir}/libclan22Vorbis.la
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/Vorbis
+%{_includedir}/ClanLib-%{cvmajor}/ClanLib/vorbis.h
+%{_pkgconfigdir}/clanVorbis-%{cvmajor}.pc
 
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/lib*.a
+%files Vorbis-static
+%defattr(644,root,root,755)
+%{_libdir}/libclan22Vorbis.a