From 166423fb00ca9cca3e0cd09086c9b5bda6d7be2716253e877777f166ea38013f Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Mon, 17 Nov 2014 07:56:41 +0000 Subject: [PATCH] Accepting request 261973 from home:Ledest:bashisms fix bashism in env_setup.sh script OBS-URL: https://build.opensuse.org/request/show/261973 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=110 --- fcitx-4.2.8.5-fix-bashisms.patch | 12 ++++++++++++ fcitx.changes | 7 +++++++ fcitx.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 fcitx-4.2.8.5-fix-bashisms.patch diff --git a/fcitx-4.2.8.5-fix-bashisms.patch b/fcitx-4.2.8.5-fix-bashisms.patch new file mode 100644 index 0000000..e00d7cf --- /dev/null +++ b/fcitx-4.2.8.5-fix-bashisms.patch @@ -0,0 +1,12 @@ +diff -Ndur fcitx-4.2.8.5/data/env_setup.sh fcitx-4.2.8.5-fix-bashisms/data/env_setup.sh +--- fcitx-4.2.8.5/data/env_setup.sh 2014-09-18 03:26:23.000000000 +0300 ++++ fcitx-4.2.8.5-fix-bashisms/data/env_setup.sh 2014-11-17 02:56:52.806374092 +0200 +@@ -31,7 +31,7 @@ + detect_qt_im_module() + { + QTPATH=`qmake -query QT_INSTALL_PLUGINS` +- ls $QTPATH/inputmethods/*fcitx* &> /dev/null ++ ls $QTPATH/inputmethods/*fcitx* >/dev/null 2>&1 + } + + if [ -z "$XMODIFIERS" ]; then diff --git a/fcitx.changes b/fcitx.changes index ffe02bf..b2ff1bd 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 17 00:58:00 UTC 2014 - Led + +- fix bashism in env_setup.sh script +- add patches: + * fcitx-4.2.8.5-fix-bashisms.patch + ------------------------------------------------------------------- Sun Nov 9 19:42:33 UTC 2014 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index 17f4eb9..8149835 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -34,6 +34,7 @@ Source7: xinput-fcitx Source8: openSUSE-themes.tar.gz Source9: macros.%{name} Source99: baselibs.conf +Patch: fcitx-4.2.8.5-fix-bashisms.patch BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel @@ -383,6 +384,7 @@ You can either use this package for download from kde-look.org using knewstaff i %prep %setup -q -n %{name}-%{version} +%patch -p1 # hack to fix incompatibility of gtk-query-immodules-2.0 (bnc#845860) %if %suse_version < 1310 sed -i \