From 2f2b7b8344a4022e150f6ea74e948b81aad0d438 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Apr 15 2009 12:49:11 +0000
Subject: Backport latest devel changes to F-9 (full update) and F-10 (multilib fix +

    keep upgrade path).

---

diff --git a/.cvsignore b/.cvsignore
index 29397f0..7abbb3c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libcaca-0.99.beta11.tar.gz
+libcaca-0.99.beta16.tar.gz
diff --git a/libcaca-0.99.beta16-multilib.patch b/libcaca-0.99.beta16-multilib.patch
new file mode 100644
index 0000000..b9d1487
--- /dev/null
+++ b/libcaca-0.99.beta16-multilib.patch
@@ -0,0 +1,29 @@
+diff -Naupr libcaca-0.99.beta16.orig/caca-config.in libcaca-0.99.beta16/caca-config.in
+--- libcaca-0.99.beta16.orig/caca-config.in	2008-09-27 17:58:05.000000000 +0200
++++ libcaca-0.99.beta16/caca-config.in	2008-12-21 14:52:39.462372516 +0100
+@@ -6,7 +6,16 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ 
+-lib_dir=@libdir@
++# Fedora specific hack to share the same script on all archs
++ARCH=$(uname -m)
++case ${ARCH} in
++x86_64|ia64|s390)
++  lib_dir=@prefix@/lib64
++  ;;
++*)
++  lib_dir=@prefix@/lib
++  ;;
++esac
+ include_dir=@includedir@
+ 
+ usage()
+@@ -114,6 +123,6 @@ fi
+ 
+ if test "$echo_libs" = "yes"
+ then
+-  echo -L@libdir@ $libs
++  echo -L$lib_dir $libs
+ fi
+ 
diff --git a/libcaca.spec b/libcaca.spec
index 8b2264c..d753409 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -1,13 +1,14 @@
-%define beta beta11
+%define beta beta16
 
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.4.%{beta}%{?dist}
+Release: 0.7.%{beta}%{?dist}
 License: WTFPL
 Group: System Environment/Libraries
 URL: http://libcaca.zoy.org/
-Source: http://libcaca.zoy.org/files/libcaca-%{version}.%{beta}.tar.gz
+Source: http://caca.zoy.org/raw-attachment/wiki/libcaca/libcaca-%{version}.%{beta}.tar.gz
+Patch0: libcaca-0.99.beta16-multilib.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: slang-devel
 BuildRequires: ncurses-devel
@@ -68,6 +69,7 @@ sprite blitting.
 
 %prep
 %setup -q -n libcaca-%{version}.%{beta}
+%patch0 -p1
 
 
 %build
@@ -79,10 +81,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 
 %install
-%{__rm} -rf %{buildroot} libcucul-dev-docs
+%{__rm} -rf %{buildroot} libcaca-dev-docs
 %makeinstall
 # We want to include the docs ourselves from the source directory
-%{__mv} %{buildroot}%{_docdir}/libcucul-dev libcucul-dev-docs
+%{__mv} %{buildroot}%{_docdir}/libcaca-dev libcaca-dev-docs
+# Remove symlink to libcaca-dev
+%{__rm} -f %{buildroot}%{_docdir}/libcucul-dev
 
 
 %clean
@@ -93,6 +97,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -100,7 +105,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %files devel
 %defattr(-,root,root,-)
-%doc ChangeLog libcucul-dev-docs/*
+%doc ChangeLog libcaca-dev-docs/html/
 %{_bindir}/caca-config
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -112,23 +117,34 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 %files -n caca-utils
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING* NEWS NOTES README THANKS TODO
+%doc AUTHORS COPYING* NEWS NOTES README THANKS
 %{_bindir}/cacademo
 %{_bindir}/cacafire
 %{_bindir}/cacaplay
 %{_bindir}/cacaserver
 %{_bindir}/cacaview
-%{_bindir}/img2irc
+%{_bindir}/img2txt
 %{_datadir}/libcaca/
 %{_mandir}/man1/cacademo.1*
 %{_mandir}/man1/cacafire.1*
 %{_mandir}/man1/cacaplay.1*
 %{_mandir}/man1/cacaserver.1*
 %{_mandir}/man1/cacaview.1*
-%{_mandir}/man1/img2irc.1*
+%{_mandir}/man1/img2txt.1*
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99-0.7.beta16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Dec 21 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.6.beta16
+- Add patch to share the same caca-config for 32 and 64bit (#341951).
+- Don't include the pdf devel doc, only html (again, fixed multilib conflict).
+
+* Mon Oct 27 2008 Matthias Saou <http://freshrpms.net/> 0.99-0.5.beta16
+- Update to 0.99beta16.
+- Update Source URL.
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.99-0.4.beta11
 - Autorebuild for GCC 4.3
 
diff --git a/sources b/sources
index c8bfc91..33768e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-94f3ae45b9d7fed43a6511452e880937  libcaca-0.99.beta11.tar.gz
+3953bf4a803747b63a99f50125563151  libcaca-0.99.beta16.tar.gz