diff --git a/.adwaita-qt.metadata b/.adwaita-qt.metadata index 68456c7..6a004d7 100644 --- a/.adwaita-qt.metadata +++ b/.adwaita-qt.metadata @@ -1 +1 @@ -21170cbaa71d4614867e04dee2ef957bb46e17f0 SOURCES/adwaita-qt-1.0.tar.gz +d847625f28572383ab37953a280ea426151ac161 SOURCES/adwaita-qt-1.2.1.tar.gz diff --git a/.gitignore b/.gitignore index d140324..8f7c5a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/adwaita-qt-1.0.tar.gz +SOURCES/adwaita-qt-1.2.1.tar.gz diff --git a/SPECS/adwaita-qt.spec b/SPECS/adwaita-qt.spec index 85f2f14..0fa8a3e 100644 --- a/SPECS/adwaita-qt.spec +++ b/SPECS/adwaita-qt.spec @@ -1,46 +1,96 @@ + Name: adwaita-qt -Version: 1.0 -Release: 5%{?dist} -License: LGPLv2+ +Version: 1.2.1 +Release: 3%{?dist} +License: LGPLv2+ and GPLv2+ Summary: Adwaita theme for Qt-based applications -Url: https://github.com/MartinBriza/adwaita-qt -Source0: https://github.com/MartinBriza/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz +Url: https://github.com/FedoraQt/adwaita-qt +Source0: https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz BuildRequires: cmake + BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtx11extras-devel + +BuildRequires: libxcb-devel Obsoletes: adwaita-qt4 < 1.0-5 Provides: adwaita-qt-common = %{version}-%{release} Obsoletes: adwaita-qt-common < 1.0-5 +Requires: adwaita-qt5 + %description Theme to let Qt applications fit nicely into Fedora Workstation -%prep -%setup -q -n %{name}-%{version} +# Use -qt5 naming in case we provide -qt6 version in the future +%package -n adwaita-qt5 +Summary: Adwaita Qt5 theme +Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} +Provides: adwaita-qt = %{version}-%{release} +Obsoletes: adwaita-qt < 1.2.1 +%description -n adwaita-qt5 +Adwaita theme variant for applications utilizing Qt5. -%build -mkdir -p %{_target_platform} -pushd %{_target_platform} -%{cmake} .. -popd +%package -n libadwaita-qt5 +Summary: Adwaita Qt5 library -make %{?_smp_mflags} -C %{_target_platform} +%description -n libadwaita-qt5 +%{summary}. +%package -n libadwaita-qt5-devel +Summary: Development files for libadwaita-qt5 +Requires: libadwaita-qt5%{?_isa} = %{version}-%{release} -%install -make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%description -n libadwaita-qt5-devel +The libadwaita-qt5-devel package contains libraries and header files for +developing applications that use libadwaita-qt5. + +%prep +%autosetup -n %{name}-%{version} -p1 +%build +%{cmake} . + +%make_build -%files +%install +make install/fast DESTDIR=%{buildroot} + +%files -n adwaita-qt5 %doc LICENSE.LGPL2 README.md %{_qt5_plugindir}/styles/adwaita.so +%files -n libadwaita-qt5 +%{_libdir}/libadwaitaqt.so.* +%{_libdir}/libadwaitaqtpriv.so.* + +%files -n libadwaita-qt5-devel +%dir %{_includedir}/AdwaitaQt +%{_includedir}/AdwaitaQt/*.h +%dir %{_libdir}/cmake/AdwaitaQt +%{_libdir}/cmake/AdwaitaQt/*.cmake +%{_libdir}/pkgconfig/adwaita-qt.pc +%{_libdir}/libadwaitaqt.so +%{_libdir}/libadwaitaqtpriv.so + %changelog +* Wed Apr 28 2021 Jan Grulich - 1.2.1-3 +- Rebuild (binutils) + Resolves: bz#1930074 + +* Fri Apr 16 2021 Jan Grulich - 1.2.1-2 +- Adwaita-qt5 replaces adwaita-qt + Resolves: bz#1930074 + +* Thu Apr 08 2021 Jan Grulich - 1.2.1-1 +- 1.2.1 + Resolves: bz#1930074 + * Mon May 14 2018 Jan Grulich - 1.0-5 - Drop Qt4 variant