[libcaca] * Tue Mar 11 2014 Matthias Saou <matthias at saou.eu> 0.99-0.19.beta18 - Update to 0.99.beta18 (#106263

[Matthias Saou]

commit 21974fd02939b746555dacb745260e59166fbc8d
Author: Matthias Saou <matthias at saou.eu>
Date:   Tue Mar 11 16:54:39 2014 +0100

    * Tue Mar 11 2014 Matthias Saou <matthias at saou.eu> 0.99-0.19.beta18
    - Update to 0.99.beta18 (#1062632).
    - Add python-caca sub-package with python bindings.

 .gitignore   |    3 ++-
 libcaca.spec |   39 +++++++++++++++++++++++++++++++++------
 sources      |    2 +-
 3 files changed, 36 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d14ab87..c4bf599 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-libcaca-0.99.beta17.tar.gz
+/libcaca-0.99.beta17.tar.gz
+/libcaca-0.99.beta18.tar.gz
diff --git a/libcaca.spec b/libcaca.spec
index d41acfa..9e6b233 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -1,9 +1,18 @@
-%define beta beta17
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
+%{!?ruby_vendorlibdir: %global ruby_vendorlibdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorlibdir"]')}
+%{!?ruby_vendorarchdir: %global ruby_vendorarchdir %(ruby -r rbconfig -e 'print RbConfig::CONFIG["vendorarchdir"]')}
+
+%define beta beta18
 
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.18.%{beta}%{?dist}
+Release: 0.19.%{beta}%{?dist}
 License: WTFPL
 Group: System Environment/Libraries
 URL: http://caca.zoy.org/wiki/libcaca
@@ -71,6 +80,15 @@ rendering features such as line and ellipses drawing, triangle filling and
 sprite blitting.
 
 
+%package -n python-caca
+Summary: Python bindings for libcaca
+Group: Development/Libraries
+BuildRequires: python2-devel
+
+%description -n python-caca
+This package contains the python bindings for using libcaca from python.
+
+
 %package -n ruby-caca
 Summary: Ruby bindings for libcaca
 Group: Development/Libraries
@@ -89,11 +107,10 @@ This package contains the ruby bindings for using libcaca from ruby.
 
 
 %build
-export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbConfig::CONFIG['sitearch'])"`
-
 sed -i -e 's|Config::CONFIG\["sitearchdir"\]|Config::CONFIG["vendorarchdir"]|' \
-       -e 's|Config::CONFIG\["sitelibdir"\]|Config::CONFIG["vendorlibdir"]|' configure
-
+       -e 's|Config::CONFIG\["sitelibdir"\]|Config::CONFIG["vendorlibdir"]|' \
+       -e "s|rbconfig -e 'print Config|rbconfig -e 'print RbConfig|" \
+  configure
 %configure \
   --disable-static \
   --disable-csharp \
@@ -143,6 +160,7 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING* NEWS NOTES README THANKS
 %{_bindir}/cacademo
 %{_bindir}/cacafire
+%{_bindir}/cacaclock
 %{_bindir}/cacaplay
 %{_bindir}/cacaserver
 %{_bindir}/cacaview
@@ -155,6 +173,11 @@ rm -rf %{buildroot}
 %{_mandir}/man1/cacaview.1*
 %{_mandir}/man1/img2txt.1*
 
+%files -n python-caca
+%defattr(-,root,root,-)
+%doc python/examples
+%{python2_sitelib}/caca/
+
 %files -n ruby-caca
 %defattr(-,root,root,-)
 %doc ruby/README
@@ -164,6 +187,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar 11 2014 Matthias Saou <matthias at saou.eu> 0.99-0.19.beta18
+- Update to 0.99.beta18 (#1062632).
+- Add python-caca sub-package with python bindings.
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99-0.18.beta17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 4c92f2b..90c861e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-790d6e26b7950e15909fdbeb23a7ea87  libcaca-0.99.beta17.tar.gz
+93d35dbdb0527d4c94df3e9a02e865cc  libcaca-0.99.beta18.tar.gz