- Down to 0.6.5 (stable version)

Changed files:
    ClanLib.spec -> 1.86

diff --git a/ClanLib.spec b/ClanLib.spec
index 27df935b58cbf5423e867f7a907f0c8d57bc634b..60f199e11b25b6b5fd764f773699b8bd41a676fe 100644 (file)
--- a/ClanLib.spec
+++ b/ClanLib.spec
@@ -1,21 +1,15 @@
-# TODO:
-# - check what is happening with the documentation - possible cause: just
-#   not ready
-# - clean-up
-# Warning: 0.7.2 is a developement version, but considered as stable as it is:/
-# Maybe switch to 0.6.5 ?
-#
 Summary:       ClanLib, the platform independent game SDK
 Summary(pl):   ClanLib, niezale¿ny od platformy SDK do gier
 Summary(pt_BR):        SDK Clanlib
 Name:          ClanLib
-Version:       0.7.2
-Release:       0.1
-License:       LGPL v2
+Version:       0.6.5
+Release:       1
+License:       LGPL
 Group:         Libraries
-Source0:       http://www.clanlib.org/~sphair/download/%{name}-%{version}-1.tar.bz2
-# Source0-md5: cbaa39f7de761e2cba52ddd97795150e
+# Source0-md5: 7115921953ef6fa45102c28622493650
+Source0:       http://www.clanlib.org/~sphair/download/%{name}-%{version}-1.tar.gz
 Patch0:                %{name}-OPT.patch
+Patch1:                %{name}-GL.patch
 URL:           http://www.clanlib.org/
 # doesn't build with 0.9.12
 #BuildRequires:        DirectFB-devel = 0.9.9
@@ -59,13 +53,13 @@ gr
 
 %package devel
 Summary:       ClanLib development package
-Summary(pl):   Pakiet programistyczny dla ClanLib
+Summary(pl):   pakiet programistyczny dla ClanLib
 Summary(pt_BR):        Arquivos para desenvolvimento usando a Clanlib
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 Requires:      %{name}-OpenGL = %{version}
 Requires:      %{name}-MikMod = %{version}
-#Requires:     %{name}-TTF = %{version}
+Requires:      %{name}-TTF = %{version}
 Requires:      %{name}-Vorbis = %{version}
 Requires:      Hermes-devel
 
@@ -74,27 +68,16 @@ This is the development add-on package that includes the header files
 needed to compile new ClanLib applications.
 
 %description devel -l pl
-Programistyczne dodatki do ClanLiba, zawieraj± pliki nag³ówkowe
+Programistyczne dodatki do ClanLib-a, zawieraj± pliki nag³ówkowe
 potrzebne do kompilacji programów korzystaj±cych z ClanLib.
 
 %description devel -l pt_BR
 Arquivos que possibilitam o desenvolvimento de aplicativos utilizando
 a biblioteca Clanlib.
 
-%package doc
-Summary:       ClanLib reference documentation for programmers
-Summary(pl):   Dokumentacja programisty do biblioteki ClanLib
-Group:         Documentation
-
-%description doc
-ClanLib reference documentation for programmers.
-
-%description doc -l pl
-Dokumentacja programisty do biblioteki ClanLib
-
 %package svgalib
 Summary:       svgalib target for ClanLib
-Summary(pl):   Obs³uga svgalib dla ClanLib
+Summary(pl):   obs³uga svgalib dla ClanLib
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 
@@ -102,24 +85,23 @@ Requires:  %{name} = %{version}
 This is the svgalib target for ClanLib.
 
 %description svgalib -l pl
-Obs³uga svgalib dla ClanLiba.
+Obs³uga svgalib dla ClanLib-a.
 
 %package OpenGL
 Summary:       OpenGL target for ClanLib
-Summary(pl):   Obs³uga OpenGL dla ClanLib
+Summary(pl):   obs³uga OpenGL dla ClanLib
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
-Requires:      OpenGL
 
 %description OpenGL
 This is the OpenGL target for ClanLib.
 
 %description OpenGL -l pl
-Obs³uga OpenGL dla ClanLiba.
+Obs³uga OpenGL dla ClanLib-a.
 
 %package GGI
 Summary:       GGI target for ClanLib
-Summary(pl):   Obs³uga GGI dla ClanLib
+Summary(pl):   obs³uga GGI dla ClanLib
 Group:         Development/Libraries
 Requires:      %{name} = %{version}
 
@@ -127,7 +109,7 @@ Requires:   %{name} = %{version}
 This is the GGI target for ClanLib.
 
 %description GGI -l pl
-Obs³uga GGI dla ClanLiba.
+Obs³uga GGI dla ClanLib-a.
 
 %package MikMod
 Summary:       MikMod module for ClanLib
@@ -139,7 +121,7 @@ Requires:   %{name} = %{version}
 MikMod module for ClanLib.
 
 %description MikMod -l pl
-Modu³ Mikmod dla ClanLiba.
+Modu³ Mikmod dla ClanLib-a.
 
 %package Vorbis
 Summary:       Vorbis module for ClanLib
@@ -151,42 +133,42 @@ Requires: %{name} = %{version}
 Vorbis module for ClanLib.
 
 %description Vorbis -l pl
-Modu³ Vorbis dla ClanLiba.
+Modu³ Vorbis dla ClanLib-a.
 
-#%package TTF
-#Summary:      TTF module for ClanLib
-#Summary(pl):  Modu³ TTF dla ClanLib
-#Group:                Development/Libraries
-#Requires:     %{name} = %{version}
+%package TTF
+Summary:       TTF module for ClanLib
+Summary(pl):   Modu³ TTF dla ClanLib
+Group:         Development/Libraries
+Requires:      %{name} = %{version}
 
-#%description TTF
-#TTF module for ClanLib.
+%description TTF
+TTF module for ClanLib.
 
-#%description TTF -l pl
-#Modu³ TTF dla ClanLiba.
+%description TTF -l pl
+Modu³ TTF dla ClanLib-a.
 
 %package static
-Summary:       ClanLib static libraries
-Summary(pl):   Statyczne biblioteki ClanLib
+Summary:       ClanLib development package
+Summary(pl):   pakiet programistyczny dla ClanLib
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}
 
 %description static
-This package contains static versions of ClanLib libraries.
+This is the development add-on package that includes the header files
+needed to compile new ClanLib applications.
 
 %description static -l pl
-Ten pakiet zawiera statyczne wersje bibliotek ClanLib.
+Programistyczne dodatki do ClanLib-a, zawieraj± pliki nag³ówkowe
+potrzebne do kompilacji programów korzystaj±cych z ClanLib.
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 # note: rtti is needed --- ClanLib uses exceptions!
-rm -f missing
-%{__libtoolize}
 %{__aclocal}
-%{__automake}
 %{__autoconf}
 %configure \
        --enable-static \
@@ -217,41 +199,21 @@ rm -f missing
 # in fact - non existenz in actual configure...
 #      --enable-mpeg
 
-%{__make}
 
-#%{__make} docs  doesn't work
-cd Documentation
-%{__autoconf}
-cp -f Makefile Makefile.tmp
-%configure
-mv -f Makefile.tmp Makefile
-Utilities/webbuilder.pl documentation.theme index.xml
-Utilities/webbuilder.pl documentation.theme Tutorial/index.xml
-# tictactoe.zip contains Win32 executable
-rm -f Tutorial/index.xml Tutorial/TicTacToe/{.cvsignore,tictactoe.zip}
-%{__make} -C Overview
-%{__make} -C Reference
+%{__make}
+%{__make} docs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT 
+       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 -C Documentation/Overview \
-       HTML_PREFIX="`pwd`/html"
-%{__make} html_install -C Documentation/Reference \
+%{__make} docs_install \
+       MAN_PREFIX="$RPM_BUILD_ROOT%{_mandir}" \
        HTML_PREFIX="`pwd`/html"
-cp -rf Documentation/index.html Documentation/Tutorial html
-
-# missing from make install
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_aclocaldir}}
-install Setup/Unix/clanlib-config $RPM_BUILD_ROOT%{_bindir}
-install Documentation/clanlib-config.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install Setup/Unix/clanlib.m4 $RPM_BUILD_ROOT%{_aclocaldir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -265,26 +227,22 @@ rm -rf $RPM_BUILD_ROOT
 %post   MikMod -p /sbin/ldconfig
 %postun MikMod -p /sbin/ldconfig
 
-#%post   TTF -p /sbin/ldconfig
-#%postun TTF -p /sbin/ldconfig
+%post   TTF -p /sbin/ldconfig
+%postun TTF -p /sbin/ldconfig
 
 %post   Vorbis -p /sbin/ldconfig
 %postun Vorbis -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
-%doc BUGS CREDITS NEWS README README.gui 
 %attr(755,root,root) %{_libdir}/libclanApp.so.*.*
 %attr(755,root,root) %{_libdir}/libclanCore.so.*.*
 %attr(755,root,root) %{_libdir}/libclanDisplay.so.*.*
 %attr(755,root,root) %{_libdir}/libclanGUI.so.*.*
-#%attr(755,root,root) %{_libdir}/libclan*JPEG.so.*.*
+%attr(755,root,root) %{_libdir}/libclan*JPEG.so.*.*
 %attr(755,root,root) %{_libdir}/libclanNetwork.so.*.*
 #%attr(755,root,root) %{_libdir}/libclanMPEG.so.*.*
-#%attr(755,root,root) %{_libdir}/libclanPNG.so.*.*
-%attr(755,root,root) %{_libdir}/libclanGUIStyleBoring.so.*.*
-%attr(755,root,root) %{_libdir}/libclanGUIStyleSilver.so.*.*
-%attr(755,root,root) %{_libdir}/libclanSignals.so.*.*
+%attr(755,root,root) %{_libdir}/libclanPNG.so.*.*
 %attr(755,root,root) %{_libdir}/libclanSound.so.*.*
 
 %files OpenGL
@@ -299,22 +257,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libclanVorbis.so.*.*
 
-#%files TTF
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/libclanTTF.so.*.*
+%files TTF
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libclanTTF.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/clanlib-config
+%doc README CREDITS html
 %attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_bindir}/*
 %{_includedir}/ClanLib
-%{_aclocaldir}/*.m4
-%{_mandir}/man1/clanlib-config.1*
-
-%files doc
-%defattr(644,root,root,755)
-%doc README.upgrade html
 
 %files static
 %defattr(644,root,root,755)