rpms/amarok/FC-4 amarok.spec,1.17,1.18

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29239

Modified Files:
	amarok.spec 
Log Message:
* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-4.fc4
- set QTLIB and QTINC, so configure script does not search for Qt in
  QTDIR/lib64 on 64-bit multilib platforms




Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amarok.spec	2 Jun 2005 10:56:45 -0000	1.17
+++ amarok.spec	2 Jun 2005 12:31:22 -0000	1.18
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.2.4
-Release:    3%{?dist}
+Release:    4%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
@@ -67,7 +67,7 @@
 enables it.
 
 
-#%if "%fedora" >= "4"
+%if "%fedora" >= "4"
 %package akode
 Summary:    AKode engine for Amarok
 Group:      Applications/Multimedia
@@ -76,7 +76,7 @@
 %description akode
 Amarok can also use the akode engine to decode sound. This package
 enables it.
-#%endif
+%endif
 
 %if 0%{?use_xine}
 %package xine
@@ -98,8 +98,9 @@
 
 
 %build
-echo "fedora = %fedora"
 unset QTDIR && . /etc/profile.d/qt.sh
+# work around an improper ${kdelibsuff}
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 %configure \
      --disable-debug \
 %if %{?use_xine:0}%{!?use_xine:1}
@@ -205,9 +206,13 @@
 
 
 %changelog
+* Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-4.fc4
+- set QTLIB and QTINC, so configure script does not search for Qt in
+  QTDIR/lib64 on 64-bit multilib platforms
+
 * Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-3.fc4
 - try to fix build problems (#158654): always set QTDIR, always
-  buildrequire libtool-ltdl-devel, disable %%fedora conditionals
+  buildrequire libtool-ltdl-devel, disable %%fedora conditional BR
 
 * Thu Jun  2 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.4-2.fc4
 - temporarily add patch to work around Fedora Core bug 159090