Hello community,
here is the log from the commit of package libqt5-creator for openSUSE:Factory
checked in at 2019-09-11 10:40:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old)
and /work/SRC/openSUSE:Factory/.libqt5-creator.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator"
Wed Sep 11 10:40:28 2019 rev:68 rq:729918 version:4.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes
2019-09-07 11:53:21.294274773 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-creator.new.7948/libqt5-creator.changes
2019-09-11 10:40:39.975217138 +0200
@@ -1,0 +2,7 @@
+Mon Sep 9 20:01:30 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Cleanup spec file, remove any conditionals for Leap 42.x and older.
+- Use correct Requires for Clang header files, located in libclang
+ package since Clang 6.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-creator.spec ++++++
--- /var/tmp/diff_new_pack.IOIWYZ/_old 2019-09-11 10:40:42.387216708 +0200
+++ /var/tmp/diff_new_pack.IOIWYZ/_new 2019-09-11 10:40:42.419216702 +0200
@@ -16,15 +16,6 @@
#
-%define have_qdoc 0%{?suse_version} >= 1500
-
-%if 0%{?suse_version} < 1500
-# Leap 42.x only has botan1
-%bcond_with system_botan
-%else
-%bcond_without system_botan
-%endif
-
Name: libqt5-creator
Version: 4.10.0
Release: 0
@@ -47,9 +38,7 @@
Patch2: fix-application-output.patch
BuildRequires: gdb
BuildRequires: libQt5Sql5-sqlite >= %{qt5_version}
-%if %{with system_botan}
BuildRequires: libbotan-devel
-%endif
BuildRequires: libqt5-qtbase-devel >= %{qt5_version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{qt5_version}
BuildRequires: libqt5-qtquickcontrols >= %{qt5_version}
@@ -62,20 +51,12 @@
BuildRequires: libqt5-qtx11extras-devel >= %{qt5_version}
# Needs an internal patched version :-/
# BuildRequires: cmake(KF5SyntaxHighlighting)
-%if 0%{?suse_version} < 1330
-# It does not build with the default compiler (GCC 4.8) on Leap 42.x
-%if 0%{?sle_version} <= 120200
-BuildRequires: gcc6-c++
-%else
-BuildRequires: gcc7-c++
-%endif
-%endif
# Enable the clangcodemodel plugin on openSUSE TW and Leap 15.2+, which have
LLVM >= 8.0.
%ifarch %arm aarch64 %ix86 x86_64
%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200
BuildRequires: llvm-clang-devel >= 8.0
# clangcodemodel hardcodes clang include paths: QTCREATORBUG-21972
-%requires_eq clang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1)
+%requires_eq libclang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1)
%endif
%endif
BuildRequires: update-desktop-files
@@ -127,26 +108,12 @@
%endif
%endif
opts="$opts IDE_LIBRARY_BASENAME=%{_lib}"
-%if %{with system_botan}
opts="$opts CONFIG+=use_system_botan"
-%endif
-
-makeopts=""
-%if 0%{?suse_version} < 1330
-# It does not build with the default compiler (GCC 4.8) on Leap 42.x
-%if 0%{?sle_version} <= 120200
-makeopts="$makeopts CC=gcc-6 CXX=g++-6"
-%else
-makeopts="$makeopts CC=gcc-7 CXX=g++-7"
-%endif
-%endif
%qmake5 $opts
-make %{?_smp_mflags} $makeopts
-%if %{have_qdoc}
- make qch_docs
- make html_docs
-%endif
+make %{?_smp_mflags}
+make qch_docs
+make html_docs
%install
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}%{_libdir}"
@@ -158,13 +125,11 @@
# Only relevant for macOS, needs python2
rm -r %{buildroot}%{_libdir}/qtcreator/libexec/dmgbuild
-%if %{have_qdoc}
mkdir -p %{buildroot}%{_datadir}/doc/packages/qt5
cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_datadir}/doc/packages/qt5/
mkdir -p %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator
cp -a doc/qtcreator/* %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator/
-%endif
%suse_update_desktop_file -i org.qt-project.qtcreator Development Qt IDE
@@ -200,11 +165,9 @@
%{_datadir}/applications/org.qt-project.qtcreator.desktop
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml
-%if %{have_qdoc}
%dir %{_datadir}/doc/packages/qt5
%{_datadir}/doc/packages/qt5/qtcreator/
%{_datadir}/doc/packages/qt5/qtcreator.qch
-%endif
%files plugin-devel
%license *GPL*
