diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 27e10ed..0e82eb7 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -3,6 +3,7 @@ %global debug_package %{nil} %global _enable_debug_packages 0 +%global __jar_repack %{nil} # Change following to 0 to default to no container/remote support when building for # first time in a release...this is needed to build eclipse-linuxtools-docker and @@ -32,7 +33,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: %{?scl_prefix}eclipse-cdt Version: %{majmin}.%{micro} -Release: 1%{?dist} +Release: 2%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -132,6 +133,18 @@ in Docker Containers. %endif +%package qt +Summary: QT C++ Tools +Requires: %{name} = %{epoch}:%{version}-%{release} +#for qmake +Requires: qt5-qtbase-devel +#for new qt project to work out of the box +Requires: pkgconfig(Qt5Qml) +Requires: pkgconfig(Qt5Quick) + +%description qt +Extensions to support Qt projects and objects in the indexer. + %package tests Summary: Eclipse C/C++ Development Tools (CDT) Tests Requires: %{name} = %{epoch}:%{version}-%{release} @@ -272,12 +285,14 @@ dockerInstallDir=${installDir}-docker arduinoInstallDir=${installDir}-arduino %endif llvmInstallDir=${installDir}-llvm +qtInstallDir=${installDir}-qt sdkInstallDir=${installDir}-sdk binInstallDir=${RPM_BUILD_ROOT}/%{_bindir} manInstallDir=${RPM_BUILD_ROOT}/%{_mandir}/man1 install -d -m755 $installDir install -d -m755 $parsersInstallDir install -d -m755 $llvmInstallDir +install -d -m755 $qtInstallDir install -d -m755 $sdkInstallDir install -d -m755 $testInstallDir install -d -m755 $binInstallDir @@ -413,6 +428,11 @@ mkdir -p $llvmInstallDir/eclipse/features $llvmInstallDir/eclipse/plugins mv $installDir/eclipse/features/*llvm* $llvmInstallDir/eclipse/features mv $installDir/eclipse/plugins/*llvm* $llvmInstallDir/eclipse/plugins +# Move qt plugins/features to qt install area. +mkdir -p $qtInstallDir/eclipse/features $qtInstallDir/eclipse/plugins +mv $installDir/eclipse/features/*qt* $qtInstallDir/eclipse/features +mv $installDir/eclipse/plugins/*qt.* $qtInstallDir/eclipse/plugins + %if %{_enable_container_and_remote_support} == 1 # Move arudino plugins/features to arduino install area. mkdir -p $arduinoInstallDir/eclipse/features $arduinoInstallDir/eclipse/plugins @@ -470,6 +490,11 @@ rm -rf $installDir/eclipse/binary %doc releng/org.eclipse.cdt.releng/epl-v10.html %doc releng/org.eclipse.cdt.releng/notice.html +%files qt +%{eclipse_base}/dropins/cdt-qt +%doc releng/org.eclipse.cdt.releng/epl-v10.html +%doc releng/org.eclipse.cdt.releng/notice.html + %if %{_enable_container_and_remote_support} == 1 %files arduino %{eclipse_base}/dropins/cdt-arduino @@ -483,6 +508,10 @@ rm -rf $installDir/eclipse/binary %endif %changelog +* Thu Oct 8 2015 Alexander Kurtakov 1:8.8.0-2 +- Split qt feature into subpackage with proper deps to qml, qtquick, qmake so generated project works. +- Disable brp-repack script as it just slows down the build. + * Wed Oct 07 2015 Mat Booth - 1:8.8.0-1 - Update to Mars.1 release - Bootstrap mode for secondary arches