diff --git a/.adwaita-qt.metadata b/.adwaita-qt.metadata index a3f79be..68456c7 100644 --- a/.adwaita-qt.metadata +++ b/.adwaita-qt.metadata @@ -1 +1 @@ -0b05e772f32072328441ff8cc77e7320971df7b9 SOURCES/adwaita-qt-0.4.tar.gz +21170cbaa71d4614867e04dee2ef957bb46e17f0 SOURCES/adwaita-qt-1.0.tar.gz diff --git a/.gitignore b/.gitignore index 34548c3..d140324 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/adwaita-qt-0.4.tar.gz +SOURCES/adwaita-qt-1.0.tar.gz diff --git a/SPECS/adwaita-qt.spec b/SPECS/adwaita-qt.spec index a9a92ef..a43a56b 100644 --- a/SPECS/adwaita-qt.spec +++ b/SPECS/adwaita-qt.spec @@ -1,11 +1,11 @@ Name: adwaita-qt -Version: 0.4 +Version: 1.0 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 +Source0: https://github.com/MartinBriza/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz BuildRequires: cmake BuildRequires: qt4-devel @@ -17,30 +17,26 @@ Requires: adwaita-qt4 Theme to let Qt applications fit nicely into Gnome environment -%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 %description -n adwaita-qt4 Adwaita theme variant for applications utilizing Qt4 + %package -n adwaita-qt5 Summary: Adwaita Qt5 theme -Requires: qt5-qtbase -Requires: adwaita-qt-common %description -n adwaita-qt5 Adwaita theme variant for applications utilizing Qt5 + +%package -n adwaita-qt-common +Summary: Adwaita Qt common files + +%description -n adwaita-qt-common + + %prep %setup -q -n %{name}-%{version} @@ -59,12 +55,11 @@ popd make %{?_smp_mflags} -C "%{_target_platform}-qt4" make %{?_smp_mflags} -C "%{_target_platform}-qt5" + %install 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 @@ -74,9 +69,16 @@ make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5" %doc LICENSE.LGPL2 README.md %{_qt5_plugindir}/styles/adwaita.so +%files -n adwaita-qt-common + %files + %changelog +* Wed Oct 11 2017 Martin Bříza - 1.0-1 +- Update to version 1.0 + Resolves: bz#1479346 + * Thu Apr 21 2016 Jan Grulich - 0.4-1 - Update to version 0.4 Resolves: bz#1306307