jreznik pushed to arts (epel7). "fix multilib issue"

Thu Apr 2 15:09:08 UTC 2015

>From 39967c556df541666c2f27d170b10fc4911c6e24 Mon Sep 17 00:00:00 2001
From: Than Ngo <than at fedoraproject.org>
Date: Mon, 15 May 2006 17:04:03 +0000
Subject: fix multilib issue

diff --git a/arts-1.5.2-multilib.patch b/arts-1.5.2-multilib.patch
new file mode 100644
index 0000000..ce1a67c
--- /dev/null
+++ b/arts-1.5.2-multilib.patch
@@ -0,0 +1,79 @@
+--- arts-1.5.2/configure.in.multilib	2006-03-18 12:05:04.000000000 +0100
++++ arts-1.5.2/configure.in	2006-05-15 18:30:13.000000000 +0200
+@@ -850,6 +850,7 @@
+ 
+ dnl Don't remove !
+ dnl AC_OUTPUT(artsc/artsdsp)
++dnl AC_OUTPUT(artsc/artsc.pc)
+ dnl AC_OUTPUT(soundserver/artsversion-new.h)
+ dnl AC_OUTPUT(flow/gsl/gslconfig.h)
+ 
+@@ -1123,6 +1124,7 @@
+ AC_CONFIG_FILES([ x11/Makefile ])
+ AC_CONFIG_FILES([ artsc/artsc-config ])
+ AC_CONFIG_FILES([ artsc/artsdsp ])
++AC_CONFIG_FILES([ artsc/artsc.pc ])
+ AC_CONFIG_FILES([ soundserver/artsversion-new.h ])
+ AC_CONFIG_FILES([ flow/gsl/gslconfig.h ])
+ AC_OUTPUT
+--- arts-1.5.2/configure.in.in.multilib	2006-03-17 22:26:42.000000000 +0100
++++ arts-1.5.2/configure.in.in	2006-05-15 18:30:12.000000000 +0200
+@@ -846,6 +846,7 @@
+ 
+ dnl Don't remove !
+ dnl AC_OUTPUT(artsc/artsdsp)
++dnl AC_OUTPUT(artsc/artsc.pc)
+ dnl AC_OUTPUT(soundserver/artsversion-new.h)
+ dnl AC_OUTPUT(flow/gsl/gslconfig.h)
+ 
+--- /dev/null	2006-05-15 10:33:12.595075250 +0200
++++ arts-1.5.2/artsc/artsc.pc.in	2006-05-15 18:53:35.000000000 +0200
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: artsc
++Description: arts (analog real-time synthesizer) is the sound system of KDE
++Version: @ARTS_VERSION@
++Libs: -L${libdir} -lartsc @USE_THREADS@ @LIBPTHREAD@ @GLIB_LDFLAGS@ @GLIB_LIBADD@
++Cflags: -I${includedir}/artsc @GLIB_CFLAGS@
+--- arts-1.5.2/artsc/artsc-config.in.multilib	2005-09-10 10:13:34.000000000 +0200
++++ arts-1.5.2/artsc/artsc-config.in	2006-05-15 18:52:32.000000000 +0200
+@@ -17,20 +17,18 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++artsc_cflags="`pkg-config --cflags artsc`"
++artsc_libs="`pkg-config --libs artsc`"
+ includedir=@includedir@
+-libdl=@LIBDL@
+-
+-flags=""
+ 
+ while test $# -gt 0
+ do
+   case $1 in
+     --libs)
+-	  flags="$flags -L$libdir $libdl -lartsc @USE_THREADS@ @LIBPTHREAD@ @GLIB_LDFLAGS@ @GLIB_LIBADD@"
++	  flags="$artsc_libs"
+ 	  ;;
+     --cflags)
+-	  flags="$flags -I$includedir/artsc @GLIB_CFLAGS@"
++	  flags="$artsc_cflags"
+ 	  ;;
+     --version)
+ 	  echo 0.9.5
+--- arts-1.5.2/artsc/Makefile.am.multilib	2005-09-10 10:13:34.000000000 +0200
++++ arts-1.5.2/artsc/Makefile.am	2006-05-15 18:30:12.000000000 +0200
+@@ -30,3 +30,8 @@
+ artscinclude_HEADERS = artsc.h artsc_export.h
+ 
+ artscbackend.lo: $(top_builddir)/soundserver/soundserver.h ../flow/artsflow.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = artsc.pc
++
++EXTRA_DIST = artsc.pc.in
diff --git a/arts.spec b/arts.spec
index 8be6fbd..eb29ef9 100644
--- a/arts.spec
+++ b/arts.spec
@@ -1,4 +1,4 @@
-%define _prefix /usr
+%define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
 
 %define debug 0
 %define final 0
@@ -10,7 +10,7 @@
 %define disable_gcc_check_and_hidden_visibility 1
 
 Version: 1.5.2
-Release: 1
+Release: 2
 Summary: aRts (analog realtime synthesizer) - the KDE sound system
 Name: arts
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@ Patch2: arts-1.3.92-glib2.patch
 Patch5: arts-1.3.1-alsa.patch
 Patch6: arts-1.4.0-glibc.patch
 Patch7: arts-1.5.0-check_tmp_dir.patch
+Patch8: gslconfig-wrapper.h
 
 Prereq: /sbin/ldconfig
 Requires: audiofile
@@ -94,6 +95,7 @@ KDE applications using sound).
 %patch5 -p1 -b .alsa
 %patch6 -p1 -b .glibc
 %patch7 -p1 -b .check_tmp_dir
+%patch8 -p1 -b .multilib
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
@@ -127,20 +129,20 @@ export PATH=`pwd`:$PATH
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 export PATH=`pwd`:$PATH
-export DESTDIR=$RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
+make DESTDIR=%{buildroot} install
 
-# work around for rpm bug on s390x
-%ifarch s390x
-strip $RPM_BUILD_ROOT%{_bindir}/mcopidl
+%ifarch %{multilib_arches}
+# Ugly hack to allow parallel installation of 32-bit and 64-bit arts-devel
+  mv  %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h \
+      %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig-%{_arch}.h
+  install -c -m644 %{SOURCE1}  %{buildroot}%{_includedir}/kde/arts/gsl/gslconfig.h
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf  %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -170,8 +172,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/kde/arts
 %{_includedir}/kde/artsc
 %{_bindir}/artsc-config
+%{_libdir}/pkgconfig/artsc.pc
 
 %changelog
+* Mon May 15 2006 Than Ngo <than at redhat.com> 8:1.5.2-2
+- fix multilib issue
+
 * Tue Mar 21 2006 Than Ngo <than at redhat.com> 8:1.5.2-1
 - update to 1.5.2
 
diff --git a/gslconfig-wrapper.h b/gslconfig-wrapper.h
new file mode 100644
index 0000000..585ada2
--- /dev/null
+++ b/gslconfig-wrapper.h
@@ -0,0 +1,22 @@
+/* This file is here to prevent a file conflict on multiarch systems.  A
+ * conflict will occur because apr.h has arch-specific definitions.
+ *
+ * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */
+
+#if defined(__i386__)
+#include "gslconfig-i386.h"
+#elif defined(__ia64__)
+#include "gslconfig-ia64.h"
+#elif defined(__powerpc64__)
+#include "gslconfig-ppc64.h"
+#elif defined(__powerpc__)
+#include "gslconfig-ppc.h"
+#elif defined(__s390x__)
+#include "gslconfig-s390x.h"
+#elif defined(__s390__)
+#include "gslconfig-s390.h"
+#elif defined(__x86_64__)
+#include "gslconfig-x86_64.h"
+#else
+#error "This arts-devel package does not work your architecture?"
+#endif
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arts.git/commit/?h=epel7&id=39967c556df541666c2f27d170b10fc4911c6e24
