packaging file fixes

debian.control

@@ -5,7 +5,7 @@ Maintainer: Allen Winter <[email protected]>
 
 Package: gammaray
 Architecture: any
-Depends: ${shlibs:Depends}, graphviz
+Depends: ${shlibs:Depends}, graphviz, kdstatemachineeditor
 Description: A tool to poke around in a Qt-application
  GammaRay is a tool for examining the internals of a Qt application
  and to some extent also manipulate it. GammaRay uses injection

gammaray.dsc

@@ -4,7 +4,7 @@ Version: 2.3.99
 Binary: gammaray
 Maintainer: Allen Winter <[email protected]>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), cdbs, cmake, qt5-default, qtbase5-private-dev, qtdeclarative5-dev, qtscript5-dev, qttools5-dev, libqt5svg5-dev, libqt5webkit5-dev, graphviz-dev, kdstatemachineeditor-dev
+Build-Depends: debhelper (>= 4.1.16), cdbs, cmake, qt5-default, qtbase5-private-dev, qtdeclarative5-dev, qtdeclarative5-private-dev, qtscript5-dev, qttools5-dev, libqt5svg5-dev, libqt5webkit5-dev, graphviz-dev, kdstatemachineeditor
 
 Files:
  00000000000000000000000000000000 00000 gammaray-2.3.99.tar.gz

gammaray.spec

@@ -2,20 +2,30 @@ Name:           gammaray
 Version:        2.3.99
 Release:        1
 Summary:        An introspection tool for Qt applications
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 Url:            http://github.com/KDAB/GammaRay
 Group:          Development/Tools
 License:        GPL-2.0+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Vendor:         Klaralvdalens Datakonsult AB (KDAB)
 Packager:       Klaralvdalens Datakonsult AB (KDAB) <[email protected]>
 
-BuildRequires: cmake
+BuildRequires: cmake kdstatemachineeditor-devel graphviz-devel
+%if %{defined suse_version}
 BuildRequires: libqt5-qtdeclarative-private-headers-devel libQt5Concurrent-devel libqt5-qttools-devel libqt5-qtsvg-devel libQt5PrintSupport-devel libqt5-qtscript-devel libQt5WebKitWidgets-devel
+%if 0%{?suse_version} > 1320
+BuildRequires: libqt5-qtconnectivity-devel
+%endif
 # TODO: this seems only to be in the update repo?
-# libqt5-qtconnectivity-devel
-BuildRequires: kdstatemachineeditor-devel
 BuildRequires: kcoreaddons-devel
+%endif
+
+%if %{defined fedora}
+BuildRequires: qt5-qtdeclarative-devel qt5-qtconnectivity-devel qt5-qttools-devel qt5-qtsvg-devel qt5-qtscript-devel qt5-qtwebkit-devel
+%if 0%{?fedora} >= 21
+BuildRequires:  kf5-kcoreaddons-devel
+%endif
+%endif
 
 %if %{defined suse_version}
 BuildRequires: update-desktop-files
@@ -93,20 +103,22 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE
 %{_prefix}/share/doc/gammaray
 %{_mandir}/man1/gammaray.1.gz
 %{_bindir}/gammaray
-%dir %{_libdir}/gammaray/libexec/
 %{_libdir}/gammaray/libexec/gammaray-client
 %{_libdir}/gammaray/libexec/gammaray-launcher
 %{_libdir}/libgammaray_common-*.so.*
 %{_libdir}/libgammaray_core-*.so.*
 %{_libdir}/libgammaray_ui-*.so.*
 %{_libdir}/libgammaray_client.so.*
+%{_libdir}/libgammaray_kitemmodels*
+%{_libdir}/libgammaray_launcher*
 %dir %{_libdir}/gammaray/
 %dir %{_libdir}/gammaray/*/
 %dir %{_libdir}/gammaray/*/*/
 %{_libdir}/gammaray/*/*/libgammaray_widget_export_actions.so
 %{_libdir}/gammaray/*/*/gammaray_probe.so
 %{_libdir}/gammaray/*/*/gammaray_inprocessui.so
 %{_libdir}/gammaray/*/*/gammaray_actioninspector*
+%{_libdir}/gammaray/*/*/gammaray_bluetooth.so
 %{_libdir}/gammaray/*/*/gammaray_codecbrowser*
 %{_libdir}/gammaray/*/*/gammaray_fontbrowser*
 %{_libdir}/gammaray/*/*/gammaray_selectionmodelinspector*
@@ -118,7 +130,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DKDE_INSTALL_USE
 %{_libdir}/gammaray/*/*/gammaray_styleinspector*
 %{_libdir}/gammaray/*/*/gammaray_scriptenginedebugger*
 %{_libdir}/gammaray/*/*/gammaray_webinspector*
-%{_libdir}/gammaray/*/*/gammaray_objectvisualizer*
 %{_libdir}/gammaray/*/*/gammaray_qmlsupport*
 %{_libdir}/gammaray/*/*/gammaray_quickinspector*
 %{_libdir}/gammaray/*/*/gammaray_translatorinspector*