diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-01-03 20:17:46 +0100 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2013-01-03 20:17:46 +0100 |
| commit | b566058ccb7fa94c6e34fb1e1349b093d4482d6a (patch) | |
| tree | 34f3d392092770893605fc03cfce42726c445e0b /redhat/extras/kdebluetooth | |
| parent | 4398af173f2663445e824a79c6367adab62c83e1 (diff) | |
| download | tde-packaging-b566058ccb7fa94c6e34fb1e1349b093d4482d6a.tar.gz tde-packaging-b566058ccb7fa94c6e34fb1e1349b093d4482d6a.zip | |
RPM packaging: lots of updates
Diffstat (limited to 'redhat/extras/kdebluetooth')
| -rw-r--r-- | redhat/extras/kdebluetooth/trinity-kdebluetooth.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec index 69360204b..27bac51d2 100644 --- a/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec +++ b/redhat/extras/kdebluetooth/trinity-kdebluetooth.spec @@ -106,7 +106,7 @@ KDE Bluetooth framework development libraries and headers. %patch3 -p1 -b .gcc46 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} -%patch4 -p1 -b .bluez4 +#patch4 -p1 -b .bluez4 %endif %patch11 -p1 @@ -120,6 +120,7 @@ KDE Bluetooth framework development libraries and headers. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i "admin/acinclude.m4.in" \ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|include/kde|include/tde|g" \ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -128,10 +129,9 @@ KDE Bluetooth framework development libraries and headers. %build -unset QTDIR || : ; . /etc/profile.d/qt.sh +unset QTDIR || : ; . /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - export KDEDIR=%{tde_prefix} # FIXME: dbus-tqt headers are not found without this ... |