From cfbf879133de18c593ba9ec30eebf096dc15b4bf Mon Sep 17 00:00:00 2001
From: Garrick Staples <garrick@fedoraproject.org>
Date: Thu, 14 Feb 2008 21:41:02 +0000
Subject: [PATCH] - fix multilib conflicts by splitting out libs package and
 fix timestamps     and aalib-config

---
 aalib-1.4rc5-x_libs.patch | 13 +++++++++++
 aalib-config-rpath.patch  |  4 ++--
 aalib.spec                | 47 ++++++++++++++++++++++++---------------
 3 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 aalib-1.4rc5-x_libs.patch

diff --git a/aalib-1.4rc5-x_libs.patch b/aalib-1.4rc5-x_libs.patch
new file mode 100644
index 0000000..3340e7d
--- /dev/null
+++ b/aalib-1.4rc5-x_libs.patch
@@ -0,0 +1,13 @@
+--- aalib-1.4.0/configure.in.X_LIBS	2007-12-12 17:48:53.000000000 -0800
++++ aalib-1.4.0/configure.in	2007-12-12 17:49:11.000000000 -0800
+@@ -103,8 +103,8 @@ AC_PATH_XTRA
+ if test "x$no_x" = x; then
+     x_driver=true
+     AC_DEFINE(X11_DRIVER)
+-    LIBS="$LIBS $X_EXTRA_LIBS $X_LIBS -lX11"
+-    AALIB_LIBS="$AALIB_LIBS $X_EXTRA_LIBS $X_LIBS -lX11"
++    LIBS="$LIBS $X_EXTRA_LIBS -lX11"
++    AALIB_LIBS="$AALIB_LIBS $X_EXTRA_LIBS -lX11"
+     CFLAGS="$CFLAGS $X_CFLAGS"
+ fi
+ 
diff --git a/aalib-config-rpath.patch b/aalib-config-rpath.patch
index c045a40..c325ad9 100644
--- a/aalib-config-rpath.patch
+++ b/aalib-config-rpath.patch
@@ -5,13 +5,13 @@
        ;;
  @ENABLE_SHARED_TRUE@    --libs)
 -@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @AALIB_RLD_FLAGS@"
-+@ENABLE_SHARED_TRUE@      libdirs="-L@libdir@"
++@ENABLE_SHARED_TRUE@      libdirs=""
  @ENABLE_SHARED_TRUE@      echo $libdirs @AALIB_LIBS@
  @ENABLE_SHARED_TRUE@      ;;
  @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
  @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
 -@ENABLE_STATIC_TRUE@      libdirs="-L@libdir@ @AALIB_RLD_FLAGS@"
-+@ENABLE_STATIC_TRUE@      libdirs="-L@libdir@"
++@ENABLE_STATIC_TRUE@      libdirs=""
  @ENABLE_STATIC_TRUE@      echo $libdirs @AALIB_LIBS@ 
  @ENABLE_STATIC_TRUE@      ;;
      *)
diff --git a/aalib.spec b/aalib.spec
index 354961b..2808046 100644
--- a/aalib.spec
+++ b/aalib.spec
@@ -3,7 +3,7 @@
 Summary:        ASCII art library
 Name:           aalib
 Version:        1.4.0
-Release:        0.13.%{rc_subver}%{?dist}
+Release:        0.14.%{rc_subver}%{?dist}
 License:        LGPLv2+
 Group:          System Environment/Libraries
 URL:            http://aa-project.sourceforge.net/aalib/
@@ -12,9 +12,10 @@ Patch0:         aalib-aclocal.patch
 Patch1:         aalib-config-rpath.patch
 Patch2:         aalib-1.4rc5-bug149361.patch
 Patch3:         aalib-1.4rc5-rpath.patch
-Patch4:		aalib-ppc.patch
+Patch4:		aalib-1.4rc5-x_libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  slang-devel libXt-devel gpm-devel ncurses-devel
+BuildRequires:	autoconf libtool
 
 %description
 AA-lib is a low level gfx library just as many other libraries are. The
@@ -23,6 +24,13 @@ fact, there is no graphical output possible. AA-lib replaces those
 old-fashioned output methods with a powerful ASCII art renderer. The API
 is designed to be similar to other graphics libraries.
 
+%package libs
+Summary:        Library files for aalib
+Group:          System/Libraries
+Requires:       %{name} = %{version}-%{release}
+Obsoletes:	aalib < 1.4.0-0.14
+%description libs
+This package contains library files for aalib.
 
 %package devel
 Summary:        Development files for aalib
@@ -42,36 +50,32 @@ with aalib.
 %patch1 -p0
 %patch2 -p1 -b .bug149361
 %patch3 -p1 -b .rpath
-%patch4 -p1 -b .ppc
-sed -i -e 's/^\(.*SHARED.*\)@AALIB_LIBS@/\1 -laa/' aalib-config.in
-# sigh stop autoxxx from rerunning because of our patches above.
-touch aclocal.m4
-touch configure
-touch src/stamp-h.in
-touch src/config.h.in
-touch `find -name Makefile.in`
-
+%patch4 -p1 -b .x_libs
+# included libtool is too old, we need to rebuild
+autoreconf -v -f -i
 
 %build
 %configure --disable-static  --with-curses-driver=yes --with-ncurses
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
 rm -f $RPM_BUILD_ROOT{%{_libdir}/libaa.la,%{_infodir}/dir}
 
+# clean up multilib conflicts
+touch -r NEWS $RPM_BUILD_ROOT%{_bindir}/aalib-config $RPM_BUILD_ROOT%{_datadir}/aclocal/aalib.m4
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %post devel
 /sbin/install-info %{_infodir}/libaa.info %{_infodir}/dir 2>/dev/null || :
@@ -90,9 +94,12 @@ fi
 %{_bindir}/aainfo
 %{_bindir}/aasavefont
 %{_bindir}/aatest
-%{_libdir}/libaa.so.*
 %{_mandir}/man1/aafire.1*
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libaa.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/aalib-config
@@ -103,6 +110,10 @@ fi
 %{_datadir}/aclocal/aalib.m4
 
 %changelog
+* Thu Feb 14 2008 Garrick Staples <garrick@usc.edu> 1.4.0-0.14.rc5
+- fix multilib conflicts by splitting out libs package and fix
+  timestamps and aalib-config
+
 * Wed Aug 15 2007 Garrick Staples <garrick@usc.edu> 1.4.0-0.13.rc5
 - correct License: tag