diff --git a/.gitignore b/.gitignore index b75d933..c66e5cc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /hawaii-shell-0.5.92.tar.gz /hawaii-shell-0.6.0.tar.xz /hawaii-shell-0.6.90.tar.xz +/hawaii-shell-a979a0738c047f68273be7c0d9d531e5b18cfa49.tar.gz diff --git a/hawaii-shell.spec b/hawaii-shell.spec index dab59bb..947b91f 100644 --- a/hawaii-shell.spec +++ b/hawaii-shell.spec @@ -1,10 +1,13 @@ +%define snapdate 20160419 +%define snaphash a979a0738c047f68273be7c0d9d531e5b18cfa49 + Name: hawaii-shell Summary: Hawaii shell for desktop, netbook and tablet Version: 0.6.90 -Release: 0.1.20160228git%{?dist} +Release: 1%{?snaphash:.%{snapdate}git%(echo %{snaphash} | cut -c -13)}%{?dist} License: LGPLv2+ and GPLv2+ URL: http://hawaiios.org -Source0: https://github.com/hawaii-desktop/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source0: https://github.com/hawaii-desktop/%{name}/%{?snaphash:archive}%{!?snaphash:releases/download}/%{?snaphash}%{!?snaphash:v%{version}}/%{name}-%{?snaphash}%{!?snaphash:%{version}}.tar.gz BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -30,9 +33,7 @@ BuildRequires: pam-devel Requires: qt5-qtsvg Requires: qt5-qttools -Requires: qt5-qtdeclarative Requires: qt5-qtgraphicaleffects -Requires: qt5-qtquickcontrols Requires: greenisland >= 0.7.90 Requires: kf5-solid-libs Requires: kf5-networkmanager-qt @@ -51,6 +52,7 @@ Requires: libhawaii Requires: hawaii-widget-styles Requires: hawaii-icon-theme Requires: hawaii-components = %{version} +Requires: fluid Requires: dejavu-sans-fonts Requires: dejavu-serif-fonts @@ -65,6 +67,7 @@ the desktop shell is implemented at the moment though. %package -n hawaii-components Summary: Hawaii QtQuick components Requires: qt5-qtquickcontrols +Requires: qt5-qtquickcontrols2 %description -n hawaii-components This package contains QtQuick components used by the Hawaii desktop environment shell. @@ -79,6 +82,7 @@ Requires: qt5-qtgraphicaleffects Requires: hawaii-components = %{version} Requires: hawaii-icon-theme Requires: libhawaii +Requires: fluid BuildArch: noarch %description -n sddm-theme-hawaii @@ -86,7 +90,7 @@ Official SDDM theme for the Hawaii desktop environment. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{?snaphash:%{name}-%{snaphash}}%{!?snaphash:%{name}-%{version}} %build @@ -125,6 +129,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Apr 20 2016 Pier Luigi Fiorini - 0.6.90-1.20160419gita979a0738c047 +- Update to latest snapshot + * Mon Feb 29 2016 Pier Luigi Fiorini - 0.6.90-0.1.20160228git - Update to latest snapshot diff --git a/sources b/sources index ef8b07c..803e507 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c4589f5004316ed51d5973adb07312d hawaii-shell-0.6.90.tar.xz +a5e6eb7e40b64b6c8c6b275d585009ad hawaii-shell-a979a0738c047f68273be7c0d9d531e5b18cfa49.tar.gz