diff --git a/.gitignore b/.gitignore index 16fdf33..96705a2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /qt5integration-5.1.0.8.tar.gz /qt5integration-5.1.0.10.tar.gz /qt5integration-5.1.5.tar.gz +/qt5integration-5.5.8.tar.gz diff --git a/deepin-qt5integration.spec b/deepin-qt5integration.spec index 3b46c37..a9dbfa1 100644 --- a/deepin-qt5integration.spec +++ b/deepin-qt5integration.spec @@ -1,7 +1,9 @@ %global repo qt5integration +%global _dtk_branch 5.5 +%global __provides_exclude_from ^%{_qt5_plugindir}/.*\.so$ Name: deepin-qt5integration -Version: 5.1.5 +Version: 5.5.8 Release: %autorelease Summary: Qt platform theme integration plugins for DDE # The entire source code is GPLv3+ except styles/ which is BSD, @@ -35,6 +37,7 @@ BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(mtdev) BuildRequires: pkgconfig(Qt5Multimedia) BuildRequires: pkgconfig(Qt5MultimediaWidgets) +BuildRequires: gtest-devel BuildRequires: qt5-qtbase-common # for libQt5ThemeSupport.a BuildRequires: qt5-qtbase-static @@ -56,14 +59,16 @@ Multiple Qt plugins to provide better Qt5 integration for DDE is included. %install %make_install INSTALL_ROOT=%{buildroot} +# Upstream installs the same plugin twice as Qt plugins, which breaks everything. +find %{buildroot}%{_qt5_plugindir} -type f ! -name '*%{_dtk_branch}.so' -delete -print + %files %doc README.md %license LICENSE -%{_qt5_plugindir}/platformthemes/libqdeepin.so -%{_qt5_plugindir}/iconengines/libdsvgicon.so -%{_qt5_plugindir}/imageformats/libdsvg.so -%{_qt5_plugindir}/iconengines/libdtkbuiltin.so -%{_qt5_plugindir}/styles/libchameleon.so +%{_qt5_plugindir}/platformthemes/lib*%{_dtk_branch}.so +%{_qt5_plugindir}/iconengines/lib*%{_dtk_branch}.so +%{_qt5_plugindir}/imageformats/lib*%{_dtk_branch}.so +%{_qt5_plugindir}/styles/libchameleon*%{_dtk_branch}.so %changelog %autochangelog diff --git a/sources b/sources index c5d1276..4cbeb02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qt5integration-5.1.5.tar.gz) = 400d92a979c5979d9cd9584b24cf6a02244f1172e99ef09a5648df1e173fc7793b3ad11dda6924f54230b0aba3d6ee64518e8d6428aa75f7f990462696bb6b0c +SHA512 (qt5integration-5.5.8.tar.gz) = c1c71a8f220d8e237636387eeb9a41d3438bacfcf93497d9ce2f0f6873f295aaeaea2fd09ff92d35baa249034dcc35ee115de4734ec4c60cbf9a3333241a7f3d