OBS User unknown 2009-03-17 19:13:24 +00:00 committed by Git OBS Bridge
parent db3b847ff4
commit 7d0a89de61
10 changed files with 1137 additions and 963 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:838d682d4ecb9bfc588b9c875bc0b6cb4d6438783ea70d706c5911b1ba41c448
size 743510

View File

@ -0,0 +1,14 @@
Index: configure.ac
===================================================================
--- configure.ac.orig 2009-03-16 02:37:22.000000000 +0100
+++ configure.ac 2009-03-16 02:44:16.000000000 +0100
@@ -47,7 +47,8 @@ if test "${build}" != "${host}" -a "${PK
fi
AC_MSG_CHECKING(for library suffix)
-LT_SUFFIX="`./libtool -n --mode=link gcc -o libTEST.la -no-undefined -version-number 123:666:999 -rpath / | xargs -n 1 | sed -ne 's/.*libTEST\(@<:@^, ()0-9@:>@*\)123\(@<:@^, ()0-9@:>@*\).*/\1'$LT_MAJOR'\2/p' | grep -v '\.$' | head -n 1`"
+LT_SUFFIX="`/usr/bin/libtool -n --mode=link gcc -o libTEST.la -no-undefined -version-number 123:666:999 -rpath / | xargs -n 1 | sed -ne 's/.*libTEST\(@<:@^, ()0-9@:>@*\)123\(@<:@^, ()0-9@:>@*\).*/\1'$LT_MAJOR'\2/p' | grep -v '\.$' | head -n 1`"
+
if test "$LT_SUFFIX" = ""; then
LT_SUFFIX=".so.$LT_MAJOR"
AC_MSG_RESULT([unknown, defaulting to $LT_SUFFIX])

View File

@ -0,0 +1,13 @@
Index: caca/Makefile.am
===================================================================
--- caca/Makefile.am.orig 2008-10-18 14:49:52.000000000 +0200
+++ caca/Makefile.am 2009-03-14 19:10:40.000000000 +0100
@@ -49,7 +49,7 @@ libcaca_la_DEPENDENCIES = \
$(NULL)
libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
-libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS)
+libcaca_la_LIBADD = @CACA_LIBS@ $(ZLIB_LIBS) -lGLU
codec_source = \
codec/import.c \

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f371ce84d39dbe733ddc38251ec137015e8af575110529681ea6b04e8d35839b
size 750022

View File

@ -1,11 +0,0 @@
--- cxx/cxxtest.cpp
+++ cxx/cxxtest.cpp
@@ -13,7 +13,7 @@
*/
#include <iostream>
-
+#include <string.h>
#include <cucul++.h>
#include <caca++.h>

View File

@ -1,6 +1,8 @@
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -4,7 +4,7 @@
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4b5d10a..6404126 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST = doxygen.cfg.in doxygen.css footer.html header.html \
$(man_MANS) $(doxygen_DOX)
doxygen_DOX = libcaca.dox user.dox migrating.dox tutorial.dox canvas.dox font.dox style.dox
@ -9,10 +11,10 @@
if BUILD_DOCUMENTATION
htmldoc_DATA = html/doxygen.css
@@ -46,11 +46,6 @@
$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcucul-dev/html
@@ -48,11 +48,6 @@ if BUILD_DOCUMENTATION
$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
$(DESTDIR)$(datadir)/doc/libcucul-dev/html
$(DESTDIR)$(datadir)/doc/libcaca-dev/html
- $(mkinstalldirs) $(DESTDIR)$(mandir)/man3
- for man in $$(find man -name '*.3caca'); do \
- sed -e 's/man3caca/man3/g' -e "s/fC'\([a-zA-Z0-9]*\)'/fC\"\1\"/g" \

View File

@ -1,6 +1,8 @@
--- configure.ac
+++ configure.ac
@@ -355,12 +355,12 @@
diff --git a/configure.ac b/configure.ac
index 630ea32..d3b4894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -398,12 +398,12 @@ if test "${enable_ruby}" != "no"; then
if test "${RUBY}" != "no"; then
RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')"
RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
@ -17,8 +19,10 @@
CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}"
AC_CHECK_HEADERS([ruby.h],
[ac_cv_my_have_ruby="yes"
--- ruby/Makefile.am
+++ ruby/Makefile.am
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index d4f226b..1dd2b41 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -1,11 +1,11 @@
# $Id: $
@ -28,7 +32,7 @@
+rubyvendordir = $(RUBY_VENDORLIBDIR)
if USE_RUBY
rubylib_LTLIBRARIES = caca.la cucul.la
rubylib_LTLIBRARIES = caca.la
-rubysite_DATA = lib/caca.rb
+rubyvendor_DATA = lib/caca.rb
TESTS = test

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 16 14:28:30 CET 2009 - crrodriguez@suse.de
- fix build, missing -lGLU
- Update to version 0.99.beta16
- libcucul was merged back into libcaca for more clarity
- internal FIGlet font support
- use C99 types in public headers
- runtime support for output drivers
- BBcode export support
-------------------------------------------------------------------
Wed Jan 28 14:38:21 CET 2009 - crrodriguez@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package libcaca (Version 0.99.beta13b)
# spec file for package libcaca (Version 0.99.beta16)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -22,9 +22,9 @@ Name: libcaca
BuildRequires: doxygen freetype2-devel imlib2-devel ncurses-devel pkgconfig
BuildRequires: slang-devel texlive-latex xorg-x11 xorg-x11-devel
BuildRequires: freeglut-devel xorg-x11-libs
BuildRequires: gcc-c++ libstdc++-devel mono-devel ruby-devel
Version: 0.99.beta13b
Release: 48
BuildRequires: gcc-c++ mono-devel ruby-devel
Version: 0.99.beta16
Release: 1
License: GPL v2 or later
Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++
@ -33,10 +33,11 @@ Source: http://sam.zoy.org/projects/libcaca/%{name}-%{version}.tar.bz2
Patch0: libcaca-no_slang_acsmap.patch
Patch1: libcaca-no_man3_pages.patch
Patch2: libcaca-X11_test.patch
Patch3: libcaca-missing_header.patch
Patch4: libcaca-ruby_am_cflags.patch
Patch5: libcaca-ruby_vendor_install.patch
Patch6: remove_badwords.patch
Patch7: libcaca-0.99.beta16-missing-GLU.patch
Patch8: libcaca-0.99.beta16-libtool.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}
%define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver}
@ -64,10 +65,7 @@ Authors:
License: GPL v2 or later
Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++
Requires: xorg-x11-devel, xorg-x11-libXext-devel, xorg-x11-libX11-devel,
Requires: xorg-x11-libxcb-devel, xorg-x11-libXau-devel
Requires: ncurses-devel >= 5, slang-devel, freeglut-devel, Mesa
Requires: Mesa-devel, glibc-devel
#yes, nothing else is required to link other applications with "libcaca"
Requires: %{name} = %{version}
%description devel
@ -145,15 +143,15 @@ Authors:
%if %{suse_version} < 1010
%patch0
%endif
%patch1
%patch1 -p1
%patch2
%patch3
%patch4
%patch5
%patch6 -p2
%patch5 -p1
%patch6 -p1
%patch7
%patch8
%build
export CFLAGS="%{optflags}"
autoreconf -fiv
%configure --with-pic \
--program-prefix="%{?_program_prefix}" \
@ -182,7 +180,7 @@ autoreconf -fiv
%files
%defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING NEWS NOTES README THANKS TODO
%doc AUTHORS ChangeLog COPYING NEWS NOTES README THANKS
%{_libdir}/*.so.*
%files devel
@ -193,11 +191,11 @@ autoreconf -fiv
%{_includedir}/*
%{_mandir}/man1/caca-config.1*
%{_datadir}/doc/libcucul-dev
%{_datadir}/doc/libcaca-dev
%files csharp
%defattr(-, root, root, 0755)
%{_libdir}/caca-sharp
%{_libdir}/cucul-sharp
%files ruby
%defattr(-, root, root, 0755)
@ -221,6 +219,14 @@ autoreconf -fiv
%{_mandir}/man1/img2txt.1*
%changelog
* Mon Mar 16 2009 crrodriguez@suse.de
- fix build, missing -lGLU
- Update to version 0.99.beta16
- libcucul was merged back into libcaca for more clarity
- internal FIGlet font support
- use C99 types in public headers
- runtime support for output drivers
- BBcode export support
* Wed Jan 28 2009 crrodriguez@suse.de
- remove "la" files
* Thu Dec 04 2008 cfarrell@suse.de

File diff suppressed because it is too large Load Diff