Hello community, here is the log from the commit of package gcin for openSUSE:Factory checked in at 2017-03-03 17:54:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gcin (Old) and /work/SRC/openSUSE:Factory/.gcin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcin" Fri Mar 3 17:54:54 2017 rev:31 rq:461871 version:2.8.5 Changes: -------- --- /work/SRC/openSUSE:Factory/gcin/gcin.changes 2017-02-24 02:54:27.192418592 +0100 +++ /work/SRC/openSUSE:Factory/.gcin.new/gcin.changes 2017-03-03 17:54:55.269101950 +0100 @@ -1,0 +2,6 @@ +Thu Mar 2 10:22:42 UTC 2017 - [email protected] + +- Add gcin-dont-copy-gcin-qt5-header.patch to avoid overwriting + the patched gcin-qt5.h + +------------------------------------------------------------------- New: ---- gcin-dont-copy-gcin-qt5-header.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gcin.spec ++++++ --- /var/tmp/diff_new_pack.d0ec57/_old 2017-03-03 17:54:56.000998572 +0100 +++ /var/tmp/diff_new_pack.d0ec57/_new 2017-03-03 17:54:56.000998572 +0100 @@ -44,6 +44,8 @@ Patch8: gcin-improve-build-with-pkgconfig.patch # PATCH-FIX-UPSTREAM boo#951750 [email protected] - fix the qt5 iid Patch9: gcin-fix-qt5-iid.patch +# PATCH-FIX-OPENSUSE [email protected] - Don't copy gcin-qt5.h.in since we already patched gcin-qt5.h +Patch10: gcin-dont-copy-gcin-qt5-header.patch BuildRequires: anthy-devel BuildRequires: fdupes BuildRequires: gtk2-devel @@ -167,6 +169,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 cp -r %{SOURCE2} . cp -r %{SOURCE3} . ++++++ gcin-dont-copy-gcin-qt5-header.patch ++++++ diff --git a/configure b/configure index bbe87e9..9a251df 100755 --- a/configure +++ b/configure @@ -336,15 +336,6 @@ if [ $QT5_IM = 'N' ]; then mv gcin.spec gcin.spec.tmp grep -v qt5/plugins/inputmethods gcin.spec.tmp > gcin.spec else - cd qt5-im - pkg-config --modversion Qt5Core | grep 5.5.1 > /dev/null 2> /dev/null - if [ $? = 0 ]; then - echo "You have Qt 5.5.1" - sed -e "s/FactoryInterface/FactoryInterface.5.1/" < gcin-qt5.h.in > gcin-qt5.h - else - cp gcin-qt5.h.in gcin-qt5.h - fi - cd .. for i in /usr/share/qt5/bin/moc /usr/lib/qt5/bin/moc /usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc /usr/lib64/qt5/bin/moc /usr/bin/moc do [ ! -x $i ] && continue
