diff options
Diffstat (limited to 'redhat/applications/amarok')
| -rw-r--r-- | redhat/applications/amarok/amarok-14.0.0.spec | 10 | ||||
| -rw-r--r-- | redhat/applications/amarok/amarok-3.5.13.2.spec | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec index c17360fff..9ca3797ac 100644 --- a/redhat/applications/amarok/amarok-14.0.0.spec +++ b/redhat/applications/amarok/amarok-14.0.0.spec @@ -364,13 +364,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" # Specific path for RHEL4 if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" + export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi # Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec index 46998a8b3..c2395dd2c 100644 --- a/redhat/applications/amarok/amarok-3.5.13.2.spec +++ b/redhat/applications/amarok/amarok-3.5.13.2.spec @@ -358,7 +358,8 @@ use any of xmms' visualisation plugins with Amarok. %endif %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" |