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

Author: mschwendt

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

Modified Files:
    amarok.spec 
Log Message:
* 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

Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amarok.spec	1 Jun 2005 23:31:42 -0000	1.16
+++ amarok.spec	2 Jun 2005 10:56:45 -0000	1.17
@@ -7,7 +7,7 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.2.4
-Release:    2%{?dist}
+Release:    3%{?dist}

Group: 	    Applications/Multimedia
 License:    GPL
@@ -24,11 +24,11 @@
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 BuildRequires:  libmusicbrainz-devel, xmms-devel >= 1:1.2
 BuildRequires:  libvisual-devel >= 0.2.0, SDL-devel, gtk+-devel
-%if "%fedora" >= "4"
+#%if "%fedora" >= "4"
 BuildRequires:  libtool-ltdl-devel
-%else
-BuildRequires:  libtool
-%endif
+#%else
+#BuildRequires:  libtool
+#%endif

%if  0%{?use_xine}
 BuildRequires:  xine-lib-devel >= 0:1.0.0
@@ -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,7 +98,8 @@

%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
+echo "fedora = %fedora"
+unset QTDIR && . /etc/profile.d/qt.sh
 %configure \
      --disable-debug \
 %if %{?use_xine:0}%{!?use_xine:1}
@@ -204,6 +205,10 @@

%changelog
+* 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
+
 * 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