Accepting request 59403 from home:plater

Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/59403
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcaca?expand=0&rev=6
This commit is contained in:
Dave Plater 2011-01-29 20:32:53 +00:00 committed by Git OBS Bridge
parent 7dbf74f01a
commit 4e01faa90b
14 changed files with 371 additions and 1672 deletions

View File

@ -1,13 +1,13 @@
Index: src/img2txt.c Index: src/img2txt.c
=================================================================== ===================================================================
--- src/img2txt.c.orig 2010-08-30 16:06:50.000000000 -0400 --- src/img2txt.c.orig 2011-01-29 13:45:16.663763404 +0200
+++ src/img2txt.c 2010-08-30 16:08:38.214714972 -0400 +++ src/img2txt.c 2011-01-29 13:45:34.053759487 +0200
@@ -81,14 +81,14 @@ static void version(void) @@ -79,14 +79,14 @@ static void version(void)
{ {
printf( printf(
"img2txt Copyright 2006-2007 Sam Hocevar and Jean-Yves Lamoureux\n" "img2txt Copyright 2006-2007 Sam Hocevar and Jean-Yves Lamoureux\n"
- "Internet: <sam@zoy.org> <jylam@lnxscene.org> Version: %s, date: %s\n" - "Internet: <sam@hocevar.net> <jylam@lnxscene.org> Version: %s, date: %s\n"
+ "Internet: <sam@zoy.org> <jylam@lnxscene.org> Version: %s\n" + "Internet: <sam@hocevar.net> <jylam@lnxscene.org> Version: %s\n"
"\n" "\n"
"img2txt, along with its documentation, may be freely copied and distributed.\n" "img2txt, along with its documentation, may be freely copied and distributed.\n"
"\n" "\n"

View File

@ -0,0 +1,13 @@
Index: doc/doxygen.cfg.in
===================================================================
--- doc/doxygen.cfg.in.orig 2010-01-03 04:54:32.000000000 +0200
+++ doc/doxygen.cfg.in 2010-11-20 07:32:05.000000000 +0200
@@ -1047,7 +1047,7 @@ USE_PDFLATEX = YES
# running if errors occur, instead of asking the user for help.
# This option is also used when generating formulas in HTML.
-LATEX_BATCHMODE = YES
+LATEX_BATCHMODE = NO
# If LATEX_HIDE_INDICES is set to YES then doxygen will not
# include the index chapters (such as File Index, Compound Index, etc.)

View File

@ -1,14 +0,0 @@
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

@ -1,8 +1,8 @@
Index: caca/Makefile.am Index: caca/Makefile.am
=================================================================== ===================================================================
--- caca/Makefile.am.orig 2008-10-18 14:49:52.000000000 +0200 --- caca/Makefile.am.orig 2010-02-08 14:34:28.000000000 +0200
+++ caca/Makefile.am 2009-03-14 19:10:40.000000000 +0100 +++ caca/Makefile.am 2011-01-29 12:13:29.633631655 +0200
@@ -49,7 +49,7 @@ libcaca_la_DEPENDENCIES = \ @@ -54,7 +54,7 @@ libcaca_la_DEPENDENCIES = \
$(NULL) $(NULL)
libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__ libcaca_la_CPPFLAGS = $(AM_CPPFLAGS) @CACA_CFLAGS@ -D__LIBCACA__
libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@ libcaca_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@

View File

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

View File

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

View File

@ -1,6 +1,8 @@
--- configure.ac Index: configure.ac
+++ configure.ac ===================================================================
@@ -173,7 +173,7 @@ --- configure.ac.orig 2010-02-08 14:34:28.000000000 +0200
+++ configure.ac 2011-01-29 12:09:24.385753017 +0200
@@ -213,7 +213,7 @@ if test "${enable_x11}" != "no"; then
AC_CHECK_LIB(X11, XOpenDisplay, AC_CHECK_LIB(X11, XOpenDisplay,
[ac_cv_my_have_x11="yes" [ac_cv_my_have_x11="yes"
if test -n "${x_includes}"; then X_CFLAGS="-I${x_includes}"; fi if test -n "${x_includes}"; then X_CFLAGS="-I${x_includes}"; fi

View File

@ -1,25 +0,0 @@
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
-man_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2txt.1 cacaplay.1
+man1_MANS = caca-config.1 cacafire.1 cacaview.1 cacaserver.1 img2txt.1 cacaplay.1
if BUILD_DOCUMENTATION
htmldoc_DATA = html/doxygen.css
@@ -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/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" \
- $$man >$(DESTDIR)$(mandir)/man3/$${man##*/}; \
- done
$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
rm -f $(DESTDIR)$(mandir)/man1/cacademo.1
ln -s cacafire.1 $(DESTDIR)$(mandir)/man1/cacademo.1

View File

@ -1,30 +0,0 @@
--- src/caca.c
+++ src/caca.c
@@ -37,6 +37,7 @@
# else
# include <slang.h>
# endif
+# undef acs_map
#endif
#if defined(USE_NCURSES)
# if defined(HAVE_NCURSES_H)
--- src/event.c
+++ src/event.c
@@ -35,6 +35,7 @@
# else
# include <slang.h>
# endif
+# undef acs_map
#endif
#if defined(USE_NCURSES)
# if defined(HAVE_NCURSES_H)
--- src/graphics.c
+++ src/graphics.c
@@ -35,6 +35,7 @@
# else
# include <slang.h>
# endif
+# undef acs_map
#endif
#if defined(USE_NCURSES)
# if defined(HAVE_NCURSES_H)

View File

@ -1,8 +1,8 @@
Index: ruby/Makefile.am Index: ruby/Makefile.am
=================================================================== ===================================================================
--- ruby/Makefile.am.orig --- ruby/Makefile.am.orig 2010-02-08 03:27:22.000000000 +0200
+++ ruby/Makefile.am +++ ruby/Makefile.am 2010-11-20 07:31:50.000000000 +0200
@@ -9,7 +9,7 @@ rubysite_DATA = lib/caca.rb @@ -8,7 +8,7 @@ rubysite_DATA = lib/caca.rb
TESTS = test TESTS = test
endif endif

View File

@ -1,8 +1,8 @@
diff --git a/configure.ac b/configure.ac Index: configure.ac
index 630ea32..d3b4894 100644 ===================================================================
--- a/configure.ac --- configure.ac.orig 2011-01-29 12:09:24.385753017 +0200
+++ b/configure.ac +++ configure.ac 2011-01-29 12:09:54.937754460 +0200
@@ -398,12 +398,12 @@ if test "${enable_ruby}" != "no"; then @@ -471,12 +471,12 @@ if test "${enable_ruby}" != "no"; then
if test "${RUBY}" != "no"; then if test "${RUBY}" != "no"; then
RUBY_CFLAGS="-I$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"archdir"@:>@')" 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"@:>@')" RUBY_LIBS="-L$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"libdir"@:>@') -l$(ruby -r rbconfig -e 'print Config::CONFIG@<:@"RUBY_SO_NAME"@:>@')"
@ -19,12 +19,11 @@ index 630ea32..d3b4894 100644
CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${RUBY_CFLAGS}"
AC_CHECK_HEADERS([ruby.h], AC_CHECK_HEADERS([ruby.h],
[ac_cv_my_have_ruby="yes" [ac_cv_my_have_ruby="yes"
diff --git a/ruby/Makefile.am b/ruby/Makefile.am Index: ruby/Makefile.am
index d4f226b..1dd2b41 100644 ===================================================================
--- a/ruby/Makefile.am --- ruby/Makefile.am.orig 2011-01-29 12:09:52.514753254 +0200
+++ b/ruby/Makefile.am +++ ruby/Makefile.am 2011-01-29 12:09:54.938755226 +0200
@@ -1,11 +1,11 @@ @@ -1,10 +1,10 @@
# $Id: $
-rubylibdir = $(RUBY_SITEARCHDIR) -rubylibdir = $(RUBY_SITEARCHDIR)
-rubysitedir = $(RUBY_SITELIBDIR) -rubysitedir = $(RUBY_SITELIBDIR)

View File

@ -1,3 +1,49 @@
-------------------------------------------------------------------
Wed Jan 26 20:40:12 UTC 2011 - davejplater@gmail.com
- Fix libcaca-devel Requires: libcaca-plugins to correct
Requires: libcaca0-plugins.
-------------------------------------------------------------------
Sat Nov 20 01:21:36 UTC 2010 - davejplater@gmail.com
- Update to libcaca-0.99beta17
- Removed patches: libcaca-no_slang_acsmap.patch for < 10.1
libcaca-no_man3_pages.patch - pending investigation
remove_badwords.patch - waiting for confirmation about bad words
libcaca-0.99.beta16-libtool.patch - libtool method changed.
- Fixed patches : libcaca-ruby_am_cflags.patch,
libcaca-ruby_vendor_install.patch, caca-no-build-date.patch
and libcaca-0.99.beta16-missing-GLU.patch.
- Upstream changes : (See Changelog for more)
* Add triangle texture mapping to NEWS and update ChangeLog.
* Disable set_dither_palette until we really use it.
* Fix distribution of Java source.
* Large source code cleanup, getting rid of spaces, tabs, and svn keywords.
* Nicer make check output for our custom tests.
* Add missing ruby/test file to the distributed tarball.
* Update logo in the PHP bindings.
* Replace the old caca texture with a copy of our new logo.
* Add #undef __extern at the end of caca0.h. Thanks to Carlo Bramini for
* fixing this in #48.
* Only define CACA_ALIAS with gcc > 3 (instead of >= 3). Patch courtesy of
* Carlo Bramini. Addresses #48.
* Add brief documentation to figfont functions.
* Split check-build into check-doygen, check-source and check-win32.
* Document file functions and fix a few issues here and there.
* Move some configuration stuff from build-kernel into configure.ac.
* Activate colour toilet font support.
* Don't fail the check-build test if documentation was not built.
* Simpler and more accurate troff colour selection.
* Always draw all background in troff output, on beginning of lines too
* Fix the source code to reduce testsuite errors.
* Always draw all background in troff output
* Fix check-build verbosity.
* Fix shrext_cmds usage in configure.ac.
* Map colors to the ones known by groff, defining mines don't work
* Improve a bit troff export
* Fix libcaca.a linkage (was off by one argument), fill memory with 0xCACA.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 19 12:51:39 UTC 2010 - coolo@novell.com Fri Nov 19 12:51:39 UTC 2010 - coolo@novell.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package libcaca (Version 0.99.beta16) # spec file for package libcaca (Version 0.99.abeta17)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,28 +17,41 @@
# norootforbuild # norootforbuild
%define withjava 0
%define withpython 0
Name: libcaca Name: libcaca
BuildRequires: doxygen freetype2-devel imlib2-devel ncurses-devel pkgconfig BuildRequires: doxygen freetype2-devel imlib2-devel ncurses-devel pkgconfig
BuildRequires: slang-devel xorg-x11 xorg-x11-devel BuildRequires: slang-devel xorg-x11 xorg-x11-devel fdupes
BuildRequires: freeglut-devel xorg-x11-libs #texlive-latex
BuildRequires: gcc-c++ mono-devel ruby-devel BuildRequires: freeglut-devel xorg-x11-libs ftgl-devel
Version: 0.99.beta16 BuildRequires: gcc-c++ mono-devel ruby-devel python-devel java-devel
Release: 10 %{py_requires}
License: GPLv2+ Version: 0.99.beta17
Release: 0
License: WTFPL
Summary: Library for Colour ASCII Art, text mode graphics Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
Url: http://sam.zoy.org/projects/libcaca/ Url: http://sam.zoy.org/projects/libcaca/
Source: http://sam.zoy.org/projects/libcaca/%{name}-%{version}.tar.bz2 Source0: http://caca.zoy.org/files/libcaca/%{name}-%{version}.tar.bz2
Patch0: libcaca-no_slang_acsmap.patch Patch1: libcaca-0.99-texbuild.patch
Patch1: libcaca-no_man3_pages.patch
Patch2: libcaca-X11_test.patch Patch2: libcaca-X11_test.patch
Patch4: libcaca-ruby_am_cflags.patch Patch4: libcaca-ruby_am_cflags.patch
Patch5: libcaca-ruby_vendor_install.patch Patch5: libcaca-ruby_vendor_install.patch
Patch6: remove_badwords.patch
Patch7: libcaca-0.99.beta16-missing-GLU.patch Patch7: libcaca-0.99.beta16-missing-GLU.patch
Patch8: libcaca-0.99.beta16-libtool.patch
Patch9: caca-no-build-date.patch Patch9: caca-no-build-date.patch
# Patches from git for python bindings
#Patch10: libcaca-python-makefile.patch
#Patch11: libcaca-python-canvas.patch
#Patch12: libcaca-python-import.patch
#Patch13: libcaca-python-fixdirt.patch
#Patch14: libcaca-python-export.patch
#Patch15: libcaca-python-args.patch
#Patch16: libcaca-python-pointer.patch
#Patch17: libcaca-python-bad.patch
#Patch18: libcaca-python-events.patch
#Patch19: libcaca-python-configure.ac.patch
#Patch20: libcaca-python-Makefile.am.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch} %define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}
%define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver} %define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver}
@ -49,34 +62,143 @@ functions for colour text drawing, simple primitives for line, polygon
and ellipse drawing, as well as powerful image to text conversion and ellipse drawing, as well as powerful image to text conversion
routines. routines.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package -n libcaca0
License: WTFPL
Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++
Provides: libcaca = %{version}
Obsoletes: libcaca < %{version}
%if 0%{?suse_version} <= 1110
%ifarch == x86_64
%define python_sitelib /usr/lib64/python2.6/site-packages
%else
%define python_sitelib /usr/lib/python2.6/site-packages
%endif
%endif
%description -n libcaca0
libcaca is the Colour AsCii Art library. It provides high level
functions for colour text drawing, simple primitives for line, polygon
and ellipse drawing, as well as powerful image to text conversion
routines.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr" %if "%(pkg-config --variable prefix x11 || echo /usr/X11R6)" == "/usr"
%define _xorg7libs %{_libdir} %define _xorg7libs %{_libdir}
%else %else
%define _xorg7libs /usr/X11R6/%{_lib} %define _xorg7libs /usr/X11R6/%{_lib}
%endif %endif
%package devel %package devel
License: GPLv2+ License: WTFPL
Summary: Library for Colour ASCII Art, text mode graphics Summary: Library for Colour ASCII Art, text mode graphics
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
#yes, nothing else is required to link other applications with "libcaca" #yes, nothing else is required to link other applications with "libcaca"
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: %{name}0-plugins = %{version}
%if 0%{?withjava} == 1
Requires: %{name}0-java = %{version}
%endif
%description devel %description devel
This package contains the header files and static libraries needed to This package contains the header files and static libraries needed to
compile applications or shared objects that use libcaca. compile applications or shared objects that use libcaca.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package csharp %package csharp
License: GPLv2+ License: WTFPL
Summary: C# support for libcaca Summary: C# support for libcaca
Group: Development/Languages/Mono Group: Development/Languages/Mono
Requires: %{name} = %{version} mono Requires: %{name} = %{version}
Requires: mono
%description csharp %description csharp
This package contains all that is needed to use libcaca from C# code. This package contains all that is needed to use libcaca from C# code.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%if 0%{?withjava} == 1
%package -n libcaca0-java
License: WTFPL
Summary: Java support for libcaca
Group: Development/Languages/Java
Requires: %{name} = %{version}
Requires: java
%description -n libcaca0-java
This package contains all that is needed to use libcaca from java.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%endif
%if 0%{?withpython} == 1
%package python
License: WTFPL
Summary: Python support for libcaca
Group: Development/Languages/Python
Requires: %{name} = %{version} python-base = %{py_ver}
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description python
This package contains all that is needed to use libcaca from python.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%endif
%package -n libcaca0-plugins
License: WTFPL
Summary: Plugins for libcaca
Group: Development/Languages/C and C++
Requires: %{name} = %{version}
%description -n libcaca0-plugins
This package contains gl and x11 plugins for caca.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package ruby %package ruby
License: GPLv2+ License: WTFPL
Summary: Ruby bindings for libcaca Summary: Ruby bindings for libcaca
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Requires: %{name} = %{version} ruby Requires: %{name} = %{version} ruby
@ -84,8 +206,15 @@ Requires: %{name} = %{version} ruby
%description ruby %description ruby
All that is needed to use libcaca from ruby code. All that is needed to use libcaca from ruby code.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%package -n caca-utils %package -n caca-utils
License: GPLv2+ License: WTFPL
Summary: Colour ASCII Art Text mode graphics utilities based on libcaca Summary: Colour ASCII Art Text mode graphics utilities based on libcaca
Group: Amusements/Toys/Graphics Group: Amusements/Toys/Graphics
@ -104,22 +233,53 @@ displays burning ASCII art flames, and cacademo is a simple application
that shows the libcaca rendering features such as line and ellipses that shows the libcaca rendering features such as line and ellipses
drawing, triangle filling and sprite blitting. drawing, triangle filling and sprite blitting.
Authors:
--------
Sam Hocevar <sam@zoy.org>
Jean-Yves Lamoureux <jylam@lnxscene.org>
%prep %prep
%setup -q chmod 0644 %{S:0}
%if %{suse_version} < 1010 %setup -q -n libcaca-%{version}
%patch0
%endif
%patch1 -p1
%patch2 %patch2
%patch4 %patch4
%patch5 -p1 %patch5
%patch6 -p1
%patch7 %patch7
%patch8
%patch9 %patch9
%patch1
cat <<EOF
++++++++++++++++++++++++++++++++++++'
Patches from git for python bindings
to be removed in next release.
++++++++++++++++++++++++++++++++++++'
EOF
#%%patch10 -p1
#mkdir -p python/caca
#touch python/caca/canvas.py
#touch python/caca/display.py
#%%patch11 -p1
#%%patch12 -p1
#%%patch13 -p1
#%%patch14 -p1
#%%patch15 -p1
#%%patch16 -p1
#%%patch17 -p1
#%%patch18 -p1
#%%patch19
#%%patch20
%build %build
autoreconf -fiv find ./ -name Makefile.in -delete
rm configure
#export LIBTOOL=/usr/bin/libtool
export CFLAGS="$CFLAGS %{optflags} -I../caca/"
export CXXFLAGS="$CXXFLAGS %{optflags}"
./bootstrap
#autoreconf -fiv
%configure --with-pic \ %configure --with-pic \
--program-prefix="%{?_program_prefix}" \ --program-prefix="%{?_program_prefix}" \
--enable-slang \ --enable-slang \
@ -128,47 +288,120 @@ autoreconf -fiv
--x-libraries=%{_xorg7libs} \ --x-libraries=%{_xorg7libs} \
--enable-imlib2 \ --enable-imlib2 \
--enable-gl \ --enable-gl \
--enable-shared \ --enable-csharp \
--disable-static --enable-doc \
--enable-shared=yes \
--enable-static=no \
--enable-conio=no \
--enable-plugins \
%if 0%{?withjava} == 1
--enable-java
%else
--enable-java=no
%endif
%{__make} %{?jobs:-j%jobs} %{__make} %{?jobs:-j%jobs}
%install %install
%makeinstall %makeinstall
# We want to include the docs ourselves from the source directory
#%{__mv} %{buildroot}%{_docdir}/%{name}-devel %{name}-devel-docs
%{__rm} -f %{buildroot}%{_libdir}/*.la %{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_libdir}/caca/*.la
%if 0%{?withjava} == 1
%{__rm} -f %{buildroot}%{_libdir}/jni/libcaca-java.la
%endif
%post -p /sbin/ldconfig %fdupes -s %{buildroot}%{python_sitelib}/caca/
%fdupes -s %{buildroot}%{_mandir}/
%fdupes -s %{buildroot}%{_libdir}/mono
%postun -p /sbin/ldconfig %post -n libcaca0 -p /sbin/ldconfig
%postun -n libcaca0 -p /sbin/ldconfig
%post -n libcaca0-plugins -p /sbin/ldconfig
%postun -n libcaca0-plugins -p /sbin/ldconfig
%if 0%{?withjava} == 1
%post -n libcaca0-java -p /sbin/ldconfig
%postun -n libcaca0-java -p /sbin/ldconfig
%endif
%clean %clean
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
%files %files -n libcaca0
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%doc AUTHORS ChangeLog COPYING NEWS NOTES README THANKS %doc AUTHORS ChangeLog COPYING NEWS NOTES README THANKS
%{_libdir}/*.so.* %{_libdir}/*.so.*
%files devel %files devel
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%dir %{_libdir}/caca
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/caca/libx11_plugin.so
%{_libdir}/caca/libgl_plugin.so
%{_bindir}/caca-config %{_bindir}/caca-config
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_includedir}/* %{_includedir}/*
%{_mandir}/man1/caca-config.1* %{_mandir}/man1/caca-config.1*
%{_mandir}/man3/*
%{_datadir}/doc/libcucul-dev %{_datadir}/doc/libcucul-dev
%{_datadir}/doc/libcaca-dev %{_datadir}/doc/libcaca-dev
%if 0%{?withjava} == 1
%{_libdir}/jni/libcaca-java.so
%endif
%files csharp %files csharp
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%{_libdir}/caca-sharp %{_libdir}/mono
%files ruby %files ruby
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%{rb_vendorarch}/* %{rb_vendorarch}/*
%{rb_vendorlib}/caca.rb %{rb_vendorlib}/caca.rb
%if 0%{?withjava} == 1
%files -n libcaca0-java
%defattr(-, root, root, 0755)
%{_libdir}/jni/libcaca-java.so.0
%{_libdir}/jni/libcaca-java.so.0.0.0
%{_datadir}/java/libjava.jar
%endif
%if 0%{?withpython} == 1
%files python
%defattr(-, root, root, 0755)
%dir %{python_sitelib}/caca
%{python_sitelib}/caca/__init__.py
%{python_sitelib}/caca/__init__.pyc
%{python_sitelib}/caca/__init__.pyo
%{python_sitelib}/caca/canvas.py
%{python_sitelib}/caca/canvas.pyc
%{python_sitelib}/caca/canvas.pyo
%{python_sitelib}/caca/common.py
%{python_sitelib}/caca/common.pyc
%{python_sitelib}/caca/common.pyo
%{python_sitelib}/caca/display.py
%{python_sitelib}/caca/display.pyc
%{python_sitelib}/caca/display.pyo
%{python_sitelib}/caca/dither.py
%{python_sitelib}/caca/dither.pyc
%{python_sitelib}/caca/dither.pyo
%{python_sitelib}/caca/font.py
%{python_sitelib}/caca/font.pyc
%{python_sitelib}/caca/font.pyo
%endif
%files -n libcaca0-plugins
%defattr(-, root, root, 0755)
%dir %{_libdir}/caca
%{_libdir}/caca/libgl_plugin.so.0
%{_libdir}/caca/libgl_plugin.so.0.0.0
%{_libdir}/caca/libx11_plugin.so.0
%{_libdir}/caca/libx11_plugin.so.0.0.0
%files -n caca-utils %files -n caca-utils
%defattr(-, root, root, 0755) %defattr(-, root, root, 0755)
%{_bindir}/cacademo %{_bindir}/cacademo

File diff suppressed because it is too large Load Diff