SPECS (DEVEL): libcaca.spec - updated to 0.99beta11 - build GL dri...

[qboosh]

Author: qboosh                       Date: Mon Dec  4 22:01:11 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- updated to 0.99beta11
- build GL driver (as plugin)
- separated GL,X11 plugins and imlib2-based programs;
  now base package requires only slang

---- Files affected:
SPECS:
   libcaca.spec (1.13.4.4 -> 1.13.4.5) 

---- Diffs:

================================================================
Index: SPECS/libcaca.spec
diff -u SPECS/libcaca.spec:1.13.4.4 SPECS/libcaca.spec:1.13.4.5
--- SPECS/libcaca.spec:1.13.4.4	Mon Sep 11 22:46:18 2006
+++ SPECS/libcaca.spec	Mon Dec  4 23:01:06 2006
@@ -3,13 +3,15 @@
 Summary(pl):	Biblioteka graficzna wyświetlająca tekst zamiast pikseli
 Name:		libcaca
 Version:	0.99
-%define	bver	beta4
+%define	bver	beta11
 Release:	0.%{bver}.1
 License:	WTFPL
 Group:		Libraries
-Source0:	http://sam.zoy.org/libcaca/%{name}-%{version}.%{bver}.tar.gz
-# Source0-md5:	7d9d9b9e093e5235980716278636a67d
-URL:		http://sam.zoy.org/libcaca/
+Source0:	http://libcaca.zoy.org/files/%{name}-%{version}.%{bver}.tar.gz
+# Source0-md5:	94f3ae45b9d7fed43a6511452e880937
+URL:		http://libcaca.zoy.org/
+BuildRequires:	OpenGL-devel
+BuildRequires:	OpenGL-glut-devel
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	doxygen
@@ -57,14 +59,50 @@
 - mało wydajne algorytmy wyboru znaków
 - brak obsługi klawiatury w trybie surowym
 
+%package plugin-GL
+Summary:	GL plugin for libcaca library
+Summary(pl):	Wtyczka GL dla biblioteki libcaca
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-GL
+GL plugin for libcaca library.
+
+%description plugin-GL -l pl
+Wtyczka GL dla biblioteki libcaca.
+
+%package plugin-X11
+Summary:	X11 plugin for libcaca library
+Summary(pl):	Wtyczka X11 dla biblioteki libcaca
+Group:		Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description plugin-X11
+X11 plugin for libcaca library.
+
+%description plugin-X11 -l pl
+Wtyczka X11 dla biblioteki libcaca.
+
+%package img
+Summary:	libcaca-based image viewer and converter
+Summary(pl):	Przeglądarka i konwerter obrazków oparte na libcaca
+Group:		Applications/Graphics
+Requires:	%{name} = %{version}-%{release}
+
+%description img
+libcaca-based image viewer and converter. They use imlib2 to load
+images.
+
+%description img -l pl
+Przeglądarka i konwerter obrazków oparte na libcaca. Do wczytywania
+obrazków używają biblioteki imlib2.
+
 %package devel
 Summary:	Header files for libcaca library
 Summary(pl):	Pliki nagłówkowe biblioteki libcaca
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	imlib2-devel
 Requires:	slang-devel >= 2.0.0
-Requires:	xorg-lib-libX11-devel
 
 %description devel
 Header files for libcaca library.
@@ -135,22 +173,29 @@
 	--disable-gl \
 	--disable-ncurses \
 	--enable-cxx \
+	--enable-gl \
+	--enable-plugins \
 	--enable-slang \
 	--enable-x11
 
-%{__make}
+# ObjC file not used, use plain CC to link library to avoid C++/ObjC deps
+%{__make} \
+	OBJC="%{__cc}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#mv doc/man/man3caca doc/man/man3
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # replace symlink by groff include
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/caca{ball,moir,plas}.1
-echo '.so cacafire.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacaball.1
-echo '.so cacafire.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacamoir.1
-echo '.so cacafire.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacaplas.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/cacademo.1
+echo '.so cacafire.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacademo.1
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/caca/*.{a,la}
+# man3 pages have too common base names to be included
+rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*.3caca
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libcucul-dev
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,23 +206,33 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS NOTES README THANKS TODO
-%attr(755,root,root) %{_bindir}/cacaball
+%attr(755,root,root) %{_bindir}/cacademo
 %attr(755,root,root) %{_bindir}/cacafire
-%attr(755,root,root) %{_bindir}/cacamoir
-%attr(755,root,root) %{_bindir}/cacaplas
 %attr(755,root,root) %{_bindir}/cacaplay
 %attr(755,root,root) %{_bindir}/cacaserver
-%attr(755,root,root) %{_bindir}/cacaview
-%attr(755,root,root) %{_bindir}/img2irc
 %attr(755,root,root) %{_libdir}/libcaca.so.*.*.*
 %attr(755,root,root) %{_libdir}/libcucul.so.*.*.*
-
+%dir %{_libdir}/caca
 %{_datadir}/%{name}
-%{_mandir}/man1/cacaball.1*
+%{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
-%{_mandir}/man1/cacamoir.1*
-%{_mandir}/man1/cacaplas.1*
+%{_mandir}/man1/cacaplay.1*
+%{_mandir}/man1/cacaserver.1*
+
+%files plugin-GL
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/caca/libgl_plugin.so*
+
+%files plugin-X11
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/caca/libx11_plugin.so*
+
+%files img
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/cacaview
+%attr(755,root,root) %{_bindir}/img2irc
 %{_mandir}/man1/cacaview.1*
+%{_mandir}/man1/img2irc.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -225,6 +280,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13.4.5  2006/12/04 22:01:06  qboosh
+- updated to 0.99beta11
+- build GL driver (as plugin)
+- separated GL,X11 plugins and imlib2-based programs;
+  now base package requires only slang
+
 Revision 1.13.4.4  2006/09/11 20:46:18  qboosh
 - updated to 0.99.beta4, removed obsolete update patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libcaca.spec?r1=1.13.4.4&r2=1.13.4.5&f=u