diff --git a/.gitignore b/.gitignore index d8da77d..506212f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /024b00bfd7c8cb27d09188ddc239391c2c05bac4.tar.gz /0.3.tar.gz /adwaita-qt-0.4.tar.gz +/adwaita-qt-0.95.tar.gz diff --git a/adwaita-qt.spec b/adwaita-qt.spec index d46f530..baf4ee1 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,17 +1,27 @@ Name: adwaita-qt -Version: 0.4 -Release: 3%{?dist} +Version: 0.95 +Release: 1%{?dist} License: LGPLv2+ Summary: Adwaita theme for Qt-based applications Url: https://github.com/MartinBriza/adwaita-qt Source0: https://github.com/MartinBriza/adwaita-qt/archive/adwaita-qt-%{version}.tar.gz -Patch0: qt-creator-menubar-fix.patch - BuildRequires: cmake BuildRequires: qt4-devel BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel +BuildRequires: kdelibs4-devel +BuildRequires: extra-cmake-modules +BuildRequires: kf5-kconfig-devel +BuildRequires: kf5-kconfigwidgets-devel +BuildRequires: kf5-kwindowsystem-devel +BuildRequires: kf5-ki18n-devel +BuildRequires: kf5-kguiaddons-devel +BuildRequires: kf5-frameworkintegration-devel +BuildRequires: kf5-kwayland-devel +BuildRequires: kf5-kpackage-devel + Requires: adwaita-qt4 @@ -19,18 +29,10 @@ Requires: adwaita-qt4 Theme to let Qt applications fit nicely into Fedora Workstation -%package common -Summary: Adwaita Qt theme shared files -BuildArch: noarch -Requires: oxygen-icon-theme - -%description common -Common files (assets, etc.) for the Adwaita Qt theme - %package -n adwaita-qt4 Summary: Adwaita Qt4 theme Requires: qt4 -Requires: adwaita-qt-common +Requires: kdelibs %description -n adwaita-qt4 Adwaita theme variant for applications utilizing Qt4 @@ -39,7 +41,8 @@ Adwaita theme variant for applications utilizing Qt4 %package -n adwaita-qt5 Summary: Adwaita Qt5 theme Requires: qt5-qtbase -Requires: adwaita-qt-common +Requires: kf5-kconfig + %description -n adwaita-qt5 Adwaita theme variant for applications utilizing Qt5 @@ -48,12 +51,11 @@ Adwaita theme variant for applications utilizing Qt5 %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .qt-creator-menubar-fix %build mkdir -p "%{_target_platform}-qt4" pushd "%{_target_platform}-qt4" -%{cmake} -DUSE_QT4=true .. +%{cmake} -DUSE_KDE4=true .. popd mkdir -p "%{_target_platform}-qt5" @@ -69,8 +71,6 @@ make %{?_smp_mflags} -C "%{_target_platform}-qt5" make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt4" make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5" -%files common -%{_datadir}/themes/Adwaita/qt/* %files -n adwaita-qt4 %doc LICENSE.LGPL2 README.md @@ -83,6 +83,9 @@ make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5" %files %changelog +* Tue Dec 13 2016 Martin Briza - 0.95-1 +- Update to 0.95 + * Thu Jun 30 2016 Jan Grulich - 0.4-3 - Properly fix missing menubar in QtCreator diff --git a/sources b/sources index b9a40b6..325e3bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f41ec67d19e168afa4e11b5941d9f6e adwaita-qt-0.4.tar.gz +SHA512 (adwaita-qt-0.95.tar.gz) = b253feaca81b491f28e7cf419e651b8233601d9a7804f2e2a5e35455e465334eac91069ac47045d93ab99677ab9ab7b7ee64ea436500bba7cf6bd3fe21f48947