Author: hawk Date: Sun Mar 4 14:15:31 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged version 0.99 from DEVEL, required to build recent xine-lib
- BR freeglut-devel, it will not build with glut-devel
---- Files affected:
SPECS:
libcaca.spec (1.14 -> 1.14.2.1)
---- Diffs:
================================================================
Index: SPECS/libcaca.spec
diff -u SPECS/libcaca.spec:1.14 SPECS/libcaca.spec:1.14.2.1
--- SPECS/libcaca.spec:1.14 Thu Feb 1 12:33:57 2007
+++ SPECS/libcaca.spec Sun Mar 4 15:15:26 2007
@@ -2,17 +2,22 @@
Summary: Graphics library that outputs text instead of pixels
Summary(pl): Biblioteka graficzna wyświetlająca tekst zamiast pikseli
Name: libcaca
-Version: 0.9
-Release: 2
-License: LGPL
+Version: 0.99
+%define bver beta11
+Release: 0.%{bver}.1
+License: WTFPL
Group: Libraries
-Source0: http://libcaca.zoy.org/files/%{name}-%{version}.tar.bz2
-# Source0-md5: c7d5c46206091a9203fcb214abb25e4a
+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
+BuildRequires: freeglut-devel >= 2.4.0
BuildRequires: imlib2-devel
+BuildRequires: libstdc++-devel
BuildRequires: libtool
BuildRequires: slang-devel >= 2.0.0
# shouldn't these be in doxygen requirements?
@@ -55,13 +60,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
-# to be restored when switching to shared lib
-#Requires: %{name} = %{version}-%{release}
-Requires: slang-devel
+Requires: %{name} = %{version}-%{release}
+Requires: slang-devel >= 2.0.0
%description devel
Header files for libcaca library.
@@ -81,8 +123,46 @@
%description static -l pl
Statyczna biblioteka libcaca.
+%package c++
+Summary: C++ bindings for libcaca
+Summary(pl): Wiązania C++ do libcaca
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description c++
+C++ bindings for libcaca.
+
+%description c++ -l pl
+Wiązania C++ do libcaca.
+
+%package c++-devel
+Summary: C++ bindings for libcaca - header files
+Summary(pl): Wiązania C++ do libcaca - pliki nagłówkowe
+Group: Development/Libraries
+Requires: %{name}-c++ = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Requires: libstdc++-devel
+
+%description c++-devel
+C++ bindings for libcaca - header files.
+
+%description c++-devel -l pl
+Wiązania C++ do libcaca - pliki nagłówkowe.
+
+%package c++-static
+Summary: C++ bindings for libcaca - static libraries
+Summary(pl): Wiązania C++ do libcaca - biblioteki statyczne
+Group: Development/Libraries
+Requires: %{name}-c++-devel = %{version}-%{release}
+
+%description c++-static
+C++ bindings for libcaca - static libraries.
+
+%description c++-static -l pl
+Wiązania C++ do libcaca - biblioteki statyczne.
+
%prep
-%setup -q
+%setup -q -n %{name}-%{version}.%{bver}
%build
%{__libtoolize}
@@ -91,65 +171,112 @@
%{__autoheader}
%{__automake}
%configure \
- --enable-x11 \
+ --disable-gl \
--disable-ncurses \
- --enable-slang
-
-%{__make}
+ --enable-cxx \
+ --enable-gl \
+ --enable-plugins \
+ --enable-slang \
+ --enable-x11
+
+# 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,fire,moir,plas}.1
-echo '.so cacademo.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacaball.1
-echo '.so cacademo.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacafire.1
-echo '.so cacademo.1' > $RPM_BUILD_ROOT%{_mandir}/man1/cacamoir.1
-echo '.so cacademo.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
-#%post -p /sbin/ldconfig
-#%postun -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%post c++ -p /sbin/ldconfig
+%postun c++ -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc AUTHORS BUGS ChangeLog NEWS NOTES README TODO
-%attr(755,root,root) %{_bindir}/cacaball
+%doc AUTHORS COPYING ChangeLog NEWS NOTES README THANKS TODO
%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}/cacaview
-#%attr(755,root,root) %{_libdir}/libcaca.so.*.*.*
-
+%attr(755,root,root) %{_bindir}/cacaplay
+%attr(755,root,root) %{_bindir}/cacaserver
+%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)
%doc doc/html/*
%attr(755,root,root) %{_bindir}/caca-config
-#%attr(755,root,root) %{_libdir}/libcaca.so
-#%{_libdir}/libcaca.la
-%{_libdir}/libcaca.a
-%{_libdir}/libcaca_pic.a
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/libcaca.so
+%attr(755,root,root) %{_libdir}/libcucul.so
+%{_libdir}/libcaca.la
+%{_libdir}/libcucul.la
+%{_includedir}/caca.h
+%{_includedir}/caca0.h
+%{_includedir}/cucul.h
+%{_pkgconfigdir}/caca.pc
+%{_pkgconfigdir}/cucul.pc
%{_mandir}/man1/caca-config.1*
# man3 pages have too common base names to be included
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/libcaca.a
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/libcaca.a
+%{_libdir}/libcucul.a
+
+%files c++
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcaca++.so.*.*.*
+%attr(755,root,root) %{_libdir}/libcucul++.so.*.*.*
+
+%files c++-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcaca++.so
+%attr(755,root,root) %{_libdir}/libcucul++.so
+%{_libdir}/libcaca++.la
+%{_libdir}/libcucul++.la
+%{_includedir}/caca++.h
+%{_includedir}/cucul++.h
+
+%files c++-static
+%defattr(644,root,root,755)
+%{_libdir}/libcaca++.a
+%{_libdir}/libcucul++.a
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -157,6 +284,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.14.2.1 2007/03/04 14:15:26 hawk
+- merged version 0.99 from DEVEL, required to build recent xine-lib
+- BR freeglut-devel, it will not build with glut-devel
+
Revision 1.14 2007/02/01 11:33:57 qboosh
- updated URLs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/libcaca.spec?r1=1.14&r2=1.14.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
