rpms/libcaca/devel libcaca-0.99.beta16-multilib.patch, NONE, 1.1 libcaca.spec, 1.17, 1.18

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/libcaca/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18988

Modified Files:
	libcaca.spec 
Added Files:
	libcaca-0.99.beta16-multilib.patch 
Log Message:
Fix multilib issues of the devel package.


libcaca-0.99.beta16-multilib.patch:

--- NEW FILE libcaca-0.99.beta16-multilib.patch ---
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 at libdir@ $libs
+  echo -L$lib_dir $libs
 fi
 


Index: libcaca.spec
===================================================================
RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libcaca.spec	27 Oct 2008 10:20:31 -0000	1.17
+++ libcaca.spec	21 Dec 2008 17:27:53 -0000	1.18
@@ -3,11 +3,12 @@
 Summary: Library for Colour AsCii Art, text mode graphics
 Name: libcaca
 Version: 0.99
-Release: 0.5.%{beta}%{?dist}
+Release: 0.6.%{beta}%{?dist}
 License: WTFPL
 Group: System Environment/Libraries
 URL: http://libcaca.zoy.org/
 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 @@
 
 %prep
 %setup -q -n libcaca-%{version}.%{beta}
+%patch0 -p1
 
 
 %build
@@ -103,7 +105,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc ChangeLog libcaca-dev-docs/*
+%doc ChangeLog libcaca-dev-docs/html/
 %{_bindir}/caca-config
 %{_includedir}/*.h
 %{_libdir}/pkgconfig/*.pc
@@ -132,6 +134,10 @@
 
 
 %changelog
+* 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.