[qt-creator/f19: 11/11] Update to 3.1.1

[Sandro Mani]

commit 741073ed1033e47c13bb293d3635bb0ded920cea
Merge: 733973c 70d581d
Author: Sandro Mani <manisandro at gmail.com>
Date:   Wed May 21 22:39:09 2014 +0200

    Update to 3.1.1

 .gitignore      |    3 +++
 qt-creator.spec |   21 ++++++++++++++-------
 sources         |    2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)
---
diff --cc qt-creator.spec
index 4f838b3,f63dd17..64cdeb1
--- a/qt-creator.spec
+++ b/qt-creator.spec
@@@ -16,22 -18,26 +16,24 @@@ Source3:        qtcreator.appdata.xm
  
  Requires:       hicolor-icon-theme
  Requires:       xdg-utils
 -Requires:       qt5-qtquickcontrols
 -Requires:       qt5-qtdoc
  
 +#required for demos/examples
 +Requires:       qt-demos
 +Requires:       qt-examples
  # we need qt-devel and gcc-c++ to compile programs using qt-creator
 -Requires:       qt5-qtbase-devel
 +Requires:       qt4-devel
  Requires:       gcc-c++
 +%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
  
 -
 -BuildRequires:  qt5-qtbase-devel
 -BuildRequires:  qt5-qtscript-devel
 -BuildRequires:  qt5-qttools-devel
 -BuildRequires:  qt5-qtwebkit-devel
 -BuildRequires:  qt5-qtxmlpatterns-devel
 -BuildRequires:  qt5-qtx11extras-devel
 +BuildRequires:  qt4-devel >= 4.7.2
 +BuildRequires:  qt4-webkit-devel
 +# for QmlDesigner, see also https://bugzilla.redhat.com/show_bug.cgi?id=657498
 +BuildRequires:  qt4-devel-private
  BuildRequires:  desktop-file-utils
 -BuildRequires:  botan-devel
  BuildRequires:  diffutils
  BuildRequires:  appdata-tools
+ BuildRequires:  llvm-devel
+ BuildRequires:  clang-devel
  
  # long list of private shared lib names to filter out
  %include %{SOURCE2}
@@@ -46,13 -52,14 +48,14 @@@ tailored to the needs of Qt developers
  %setup -q -n qt-creator-opensource-src-%{version}%{?pre:-%pre}
  
  %build
- QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
- PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
- CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
- FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 -export QTDIR="%{_qt5_prefix}"
 -export PATH="%{_qt5_bindir}:$PATH"
++export QTDIR="%{_qt4_prefix}"
++export PATH="%{_qt4_bindir}:$PATH"
+ export CFLAGS="${CFLAGS:-%optflags}"
+ export CXXFLAGS="${CXXFLAGS:-%optflags}"
+ export FFLAGS="${FFLAGS:-%optflags}"
+ export LLVM_INSTALL_DIR="%{_libdir}/llvm"
  
 -qmake-qt5 -r IDE_LIBRARY_BASENAME=%{_lib} USE_SYSTEM_BOTAN=1
 +qmake-qt4 -r IDE_LIBRARY_BASENAME=%{_lib}
  make %{?_smp_mflags}
  
  %install
@@@ -113,8 -121,21 +116,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  #%%{_datadir}/doc/qtcreator/qtcreator.qch
  
  %changelog
 -* Tue May 20 2014 Sandro Mani <manisandro at gmail.com> - 3.1.1-1
 -- 3.1.1 release
 -
 -* Fri Apr 04 2014 Sandro Mani <manisandro at gmail.com> - 3.1.0-0.2.rc1
 -- 3.1.0 rc1 release
 -
 -* Tue Mar 25 2014 Sandro Mani <manisandro at gmail.com> - 3.1.0-0.1.beta
 -- 3.1.0 beta release
++* Wed May 21 2014 Sandro Mani <manisandro at gmail.com> - 3.1.1-1
++- 3.1.1 stable release
++- Build clang code model plugin
+ 
 -* Wed Mar 12 2014 Sandro Mani <manisandro at gmail.com> - 3.0.1-3
 +* Wed Mar 12 2014 Sandro Mani <manisandro at gmail.com> - 3.0.1-2
  - Add appdata file
 -- ExcludeArch arm due to #1074700
 -
 -* Wed Mar 05 2014 Sandro Mani <manisandro at gmail.com> - 3.0.1-2
 -- Build against Qt5
  
  * Thu Feb 06 2014 Sandro Mani <manisandro at gmail.com> - 3.0.1-1
  - 3.0.1 stable release