rpms/freealut/F-8 freealut-multiarch.patch, NONE, 1.1 freealut.spec, 1.9, 1.10

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/pkgs/rpms/freealut/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4638/F-8

Modified Files:
	freealut.spec 
Added Files:
	freealut-multiarch.patch 
Log Message:
- fix #341161 multiarch


freealut-multiarch.patch:

--- NEW FILE freealut-multiarch.patch ---
--- admin/pkgconfig/freealut-config.in.orig	2008-01-02 23:12:54.000000000 +0100
+++ admin/pkgconfig/freealut-config.in	2008-01-02 23:15:49.000000000 +0100
@@ -4,7 +4,6 @@
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
 includedir="@includedir@"
-libdir="@libdir@"
 PACKAGE_VERSION="@PACKAGE_VERSION@"
 
 freealut_dynamic_ldflags="-lalut"
@@ -19,8 +18,6 @@
 echo_bindir=no
 includedir_set=no
 echo_includedir=no
-libdir_set=no
-echo_libdir=no
 echo_version=no
 echo_cflags=no
 static_libs=no
@@ -85,10 +82,8 @@
       ;;
     --libdir=*)
       libdir="${optarg}"
-      libdir_set="yes"
       ;;
     --libdir)
-      echo_libdir="yes"
       ;;
     --version)
       echo_version="yes"
@@ -138,14 +133,6 @@
   echo "${includedir}"
 fi
 
-if test "${libdir_set}" = "no" && test "${exec_prefix_set}" = "yes"; then
-  libdir="${exec_prefix}/lib"
-fi
-
-if test "$echo_libdir" = "yes"; then
-  echo "${libdir}"
-fi
-
 if test "$echo_version" = "yes"; then
   echo "${PACKAGE_VERSION}"
 fi
@@ -160,11 +147,6 @@
 fi
 
 if test "$echo_libs" = "yes"; then
-  if test "${libdir}" = "/usr/lib" ; then
-    libpathflag=""
-  else
-    libpathflag="-L${libdir}"
-  fi
   if test "${static_libs}" = "yes"; then
      ldflags="${freealut_static_ldflags}"
   else


Index: freealut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/freealut/F-8/freealut.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- freealut.spec	22 Aug 2007 07:36:37 -0000	1.9
+++ freealut.spec	2 Jan 2008 22:29:39 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           freealut
 Version:        1.1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Implementation of OpenAL's ALUT standard
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://openal.org/
 Source0:        http://openal.org/openal_webstf/downloads/freealut-1.1.0.tar.gz
 Patch0:         freealut-openal.patch
+Patch1:         freealut-multiarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  openal-devel
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 autoreconf
 
 %build
@@ -53,6 +55,8 @@
 #./test_waveforms || exit $?
 #popd
 
+touch -r ChangeLog $RPM_BUILD_ROOT/%{_bindir}/freealut-config
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,6 +77,10 @@
 %{_libdir}/pkgconfig/freealut.pc
 
 %changelog
+* Wed Jan 02 2008 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.0-5
+- fix #341161 multiarch conflicts
+
 * Wed Aug 22 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1.1.0-4
 - fix license tag