rpms/libAfterImage/devel libAfterImage-multiarch.patch, NONE, 1.1 libAfterImage.spec, 1.10, 1.11

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/libAfterImage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8279/devel

Modified Files:
	libAfterImage.spec 
Added Files:
	libAfterImage-multiarch.patch 
Log Message:
- fix #341871 multiarch


libAfterImage-multiarch.patch:

--- NEW FILE libAfterImage-multiarch.patch ---
--- afterimage-config.in.orig	2008-01-05 01:30:14.000000000 +0100
+++ afterimage-config.in	2008-01-05 01:32:24.000000000 +0100
@@ -123,7 +123,6 @@
 
 if test "$echo_libtool" = "yes" ; then
  convlib="libAfterImage.la"
- echo @libdir@/$convlib
 fi
 
 if test "$echo_have_afterbase" = "yes" ; then
--- configure.inmultiarch	2007-08-02 00:47:08.000000000 +0200
+++ configure.in	2008-01-05 01:49:27.000000000 +0100
@@ -641,9 +641,9 @@
     	AFTERIMAGE_TEST_LIBS="-L./ -L../libAfterBase -lAfterImage $AFTERIMAGE_LIBS"
     	AFTERIMAGE_LIB_LIBS="-L./ -L../libAfterBase $AFTERIMAGE_LIBS"
     else
-    	AFTERIMAGE_APPS_LIBS="-L../ -L$libdir -lAfterImage $AFTERIMAGE_LIBS"
-    	AFTERIMAGE_TEST_LIBS="-L./ -L$libdir -lAfterImage $AFTERIMAGE_LIBS"
-    	AFTERIMAGE_LIB_LIBS="-L./ -L$libdir $AFTERIMAGE_LIBS"
+    	AFTERIMAGE_APPS_LIBS="-L../ -lAfterImage $AFTERIMAGE_LIBS"
+    	AFTERIMAGE_TEST_LIBS="-L./ -lAfterImage $AFTERIMAGE_LIBS"
+    	AFTERIMAGE_LIB_LIBS="-L./ $AFTERIMAGE_LIBS"
     fi
     AC_DEFINE(HAVE_AFTERBASE,1,[Define if libAfterBase is available])
 else
@@ -674,7 +674,7 @@
 	  CLEAN_AFTERIMAGE_LIBS="$CLEAN_AFTERIMAGE_LIBS $L"
   fi
 done
-AFTERIMAGE_LIBS="-L$libdir -lAfterImage $CLEAN_AFTERIMAGE_LIBS"
+AFTERIMAGE_LIBS="-lAfterImage $CLEAN_AFTERIMAGE_LIBS"
 AC_SUBST(AFTERIMAGE_LIBS)
 
 if test "x$enable_staticlibs" = "xyes"; then
--- configuremultiarch	2007-08-02 00:47:07.000000000 +0200
+++ configure	2008-01-05 01:50:15.000000000 +0100
@@ -8773,9 +8773,9 @@
     	AFTERIMAGE_TEST_LIBS="-L./ -L../libAfterBase -lAfterImage $AFTERIMAGE_LIBS"
     	AFTERIMAGE_LIB_LIBS="-L./ -L../libAfterBase $AFTERIMAGE_LIBS"
     else
-    	AFTERIMAGE_APPS_LIBS="-L../ -L$libdir -lAfterImage $AFTERIMAGE_LIBS"
-    	AFTERIMAGE_TEST_LIBS="-L./ -L$libdir -lAfterImage $AFTERIMAGE_LIBS"
-    	AFTERIMAGE_LIB_LIBS="-L./ -L$libdir $AFTERIMAGE_LIBS"
+    	AFTERIMAGE_APPS_LIBS="-L../ -L -lAfterImage $AFTERIMAGE_LIBS"
+    	AFTERIMAGE_TEST_LIBS="-L./ -L -lAfterImage $AFTERIMAGE_LIBS"
+    	AFTERIMAGE_LIB_LIBS="-L./ -L $AFTERIMAGE_LIBS"
     fi
 
 cat >>confdefs.h <<\_ACEOF
@@ -9282,7 +9282,7 @@
 	  CLEAN_AFTERIMAGE_LIBS="$CLEAN_AFTERIMAGE_LIBS $L"
   fi
 done
-AFTERIMAGE_LIBS="-L$libdir -lAfterImage $CLEAN_AFTERIMAGE_LIBS"
+AFTERIMAGE_LIBS="-lAfterImage $CLEAN_AFTERIMAGE_LIBS"
 
 
 if test "x$enable_staticlibs" = "xyes"; then


Index: libAfterImage.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libAfterImage/devel/libAfterImage.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libAfterImage.spec	22 Aug 2007 12:51:30 -0000	1.10
+++ libAfterImage.spec	5 Jan 2008 00:54:50 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           libAfterImage
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A generic image manipulation library
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@
 Source1:        libAfterImage-COPYING
 Patch0:         libAfterImage-Makefile-ldconfig.patch
 Patch1:         libAfterImage-afterimage-config.patch
+Patch2:         libAfterImage-multiarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel
@@ -59,8 +60,9 @@
 
 %prep
 %setup -q
-%patch0
+%patch0 
 %patch1
+%patch2 -b multiarch
 
 %build
 %configure --enable-i18n --enable-sharedlibs \
@@ -81,6 +83,8 @@
 
 cp %{SOURCE1} %{_builddir}/%{name}-%{version}/COPYING
 
+touch -r ChangeLog $RPM_BUILD_ROOT%{_bindir}/afterimage-{config,libs}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -102,6 +106,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Jan 05 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.15-3
+- fix #341871 multiarch
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.15-2
 - upgrade BR