From 65e8850c4950dc1f2f32f55148ee8819ca18057f Mon Sep 17 00:00:00 2001 From: Martin Briza Date: Jul 20 2015 12:23:09 +0000 Subject: Bump to the latest release --- diff --git a/.gitignore b/.gitignore index 85171da..daef333 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /024b00bfd7c8cb27d09188ddc239391c2c05bac4.tar.gz +/0.3.tar.gz diff --git a/adwaita-qt.spec b/adwaita-qt.spec index 35b52d0..0b927f5 100644 --- a/adwaita-qt.spec +++ b/adwaita-qt.spec @@ -1,18 +1,15 @@ -%global _hardened_build 1 -%global snapshot_commit 024b00bfd7c8cb27d09188ddc239391c2c05bac4 - Name: adwaita-qt -Version: 0 -Release: 0.7.20141216git%(echo %{snapshot_commit} | cut -c-8)%{?dist} +Version: 0.3 +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/%{snapshot_commit}.tar.gz +Source0: https://github.com/MartinBriza/adwaita-qt/archive/%{version}.tar.gz BuildRequires: cmake BuildRequires: qt4-devel -#BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtbase-devel Requires: adwaita-qt4 @@ -37,48 +34,56 @@ Requires: adwaita-qt-common Adwaita theme variant for applications utilizing Qt4 -#package -n adwaita-qt5 -#Summary: Adwaita Qt5 theme -#Requires: qt5-qtbase -#Requires: adwaita-qt-common -# -#description -#Adwaita theme variant for applications utilizing Qt5 +%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 %prep -%setup -q -n %{name}-%{snapshot_commit} +%setup -q -n %{name}-%{version} %build mkdir -p "%{_target_platform}-qt4" pushd "%{_target_platform}-qt4" -%{cmake} .. +%{cmake} -DUSE_QT4=true .. popd -#mkdir -p "#{_target_platform}-qt5" -#pushd "#{_target_platform}-qt5" -#{cmake} -DUSE_QT5=true .. -#popd +mkdir -p "%{_target_platform}-qt5" +pushd "%{_target_platform}-qt5" +%{cmake} .. +popd make %{?_smp_mflags} -C "%{_target_platform}-qt4" -#make #{?_smp_mflags} -C "#{_target_platform}-qt5" +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" +make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5" %files common -%{_datadir}/themes/Adwaita/qt4/* +%{_datadir}/themes/Adwaita/qt/* %files -n adwaita-qt4 %doc LICENSE.LGPL2 README.md %{_qt4_plugindir}/styles/adwaita.so +%files -n adwaita-qt5 +%doc LICENSE.LGPL2 README.md +%{_qt5_plugindir}/styles/adwaita.so + %files %changelog +* Mon Jul 20 2015 Martin Briza - 0.3-1 +- Updated to the latest release +- Added a Qt5 build + * Tue Jun 16 2015 Fedora Release Engineering - 0-0.7.20141216git024b00bf - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index aae283c..3679016 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69e3c8927d88fe0a5f1846ce983c2f9d 024b00bfd7c8cb27d09188ddc239391c2c05bac4.tar.gz +a5e4068feb0b3eeddac784db4951b791 0.3.tar.gz