# HG changeset patch # User Michael Schloh von Bennewitz # Date 1253610484 -7200 # Node ID 117704011216e097ad67747412f30e8b5a80a86c # Parent 862d0abd0aa87a93887458e3ea8f8f1d897d334d Correct XInput tablet build logic. diff -r 862d0abd0aa8 -r 117704011216 bacula/bacula.patch --- a/bacula/bacula.patch Tue Aug 04 19:18:40 2009 +0200 +++ b/bacula/bacula.patch Tue Sep 22 11:08:04 2009 +0200 @@ -65,14 +65,14 @@ - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 ;; restart) - $0 stop -+ $0 stop $debug $enable_dir $enable_sd $enable_fd ++ $0 stop $debug $enable_dir $enable_sd $enable_fd sleep 2 - $0 start + $0 start $debug $enable_dir $enable_sd $enable_fd diff -r 862d0abd0aa8 -r 117704011216 qt/qt.spec --- a/qt/qt.spec Tue Aug 04 19:18:40 2009 +0200 +++ b/qt/qt.spec Tue Sep 22 11:08:04 2009 +0200 @@ -35,7 +35,7 @@ # package information Name: qt -Summary: Cross-platform Application Framework +Summary: Cross Platform Application Framework URL: http://www.trolltech.com/products/qt/ Vendor: Nokia Corporation Packager: Michael Schloh von Bennewitz @@ -142,6 +142,8 @@ %{l_shtool} subst \ -e "s;^\(LIBS += \)-lfreetype -lfontconfig;\1$fontconflibs;" \ config.tests/x11/fontconfig/fontconfig.pro + echo 'INCLUDEPATH += /usr/include/wacomcfg' \ + >>src/gui/kernel/x11.pri %{l_shtool} subst \ -e "s;\(LIBS += -lpq\);\1 `%{l_prefix}/bin/pg_config --libs` $loclibs;" \ config.tests/unix/psql/psql.pro