diff --git a/.gitignore b/.gitignore index 3b03917..b75d933 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /hawaii-shell-0.3.0.tar.gz /hawaii-shell-0.5.92.tar.gz /hawaii-shell-0.6.0.tar.xz +/hawaii-shell-0.6.90.tar.xz diff --git a/hawaii-shell.spec b/hawaii-shell.spec index d8ed174..d97126a 100644 --- a/hawaii-shell.spec +++ b/hawaii-shell.spec @@ -1,7 +1,7 @@ Name: hawaii-shell Summary: Hawaii shell for desktop, netbook and tablet -Version: 0.6.0 -Release: 4%{?dist} +Version: 0.6.90 +Release: 0.1.20160224%{?dist} Group: Applications/System License: LGPLv2+ and GPLv2+ URL: http://hawaiios.org @@ -14,11 +14,7 @@ BuildRequires: pkgconfig(Qt5Qml) BuildRequires: pkgconfig(Qt5Quick) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xdg) -BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-client) -BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(gio-2.0) >= 2.31.0 BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules @@ -26,9 +22,9 @@ BuildRequires: kf5-solid-devel BuildRequires: pkgconfig(NetworkManager) BuildRequires: kf5-networkmanager-qt-devel -BuildRequires: greenisland-devel >= 0.7.1 -BuildRequires: libhawaii-devel >= 0.5.90 -BuildRequires: pkgconfig(glesv2) pkgconfig(egl) +BuildRequires: cmake(GreenIslandServer) +BuildRequires: cmake(Hawaii) + BuildRequires: alsa-lib-devel BuildRequires: pulseaudio-libs-devel BuildRequires: pam-devel @@ -38,8 +34,7 @@ Requires: qt5-qttools Requires: qt5-qtdeclarative Requires: qt5-qtgraphicaleffects Requires: qt5-qtquickcontrols -Requires: greenisland >= 0.7.1 -Requires: libhawaii >= 0.5.90 +Requires: greenisland >= 0.7.90 Requires: kf5-solid-libs Requires: kf5-networkmanager-qt Requires: NetworkManager @@ -53,7 +48,7 @@ Requires: udisks2 Requires: upower Requires: dconf -Requires: libhawaii >= 0.5.90 +Requires: libhawaii Requires: hawaii-widget-styles Requires: hawaii-icon-theme Requires: hawaii-components = %{version} @@ -107,29 +102,9 @@ make %{?_smp_mflags} -C %{_target_platform} %install make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -# Override wallpaper -mkdir -p %{buildroot}%{_datadir}/glib-2.0/schemas -cat > %{buildroot}%{_datadir}/glib-2.0/schemas/org.hawaiios.desktop.background.gschema.override < /dev/null || : - - -%postun -if [ $1 -eq 0 ]; then - glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - %files -%{!?_licensedir:%global license %%doc} -%license LICENSE.GPLv2 -%license LICENSE.LGPLv2.1 +%license LICENSE.GPLv2 LICENSE.LGPLv2.1 %doc AUTHORS.md %doc BUILD.md %doc CONTRIBUTORS.md @@ -140,23 +115,21 @@ fi %{_datadir}/wayland-sessions/* %{_datadir}/greenisland/* %{_datadir}/hawaii -%{_sysconfdir}/xdg/menus/* -%{_datadir}/desktop-directories/* -%{_datadir}/glib-2.0/schemas/* %{_userunitdir}/* %{_kf5_qmldir}/QtQuick/* %{_kf5_qmldir}/org/hawaiios/* -%{_kf5_qtplugindir}/* %files -n hawaii-components %{_kf5_qmldir}/Hawaii/* %files -n sddm-theme-hawaii -%dir %{_datadir}/sddm/themes/hawaii -%{_datadir}/sddm/themes/hawaii/* +%{_datadir}/sddm/themes/hawaii/ %changelog +* Wed Feb 24 2016 Pier Luigi Fiorini - 0.6.90-0.1.20160224 +* Update to latest snapshot + * Wed Feb 03 2016 Fedora Release Engineering - 0.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index b331c83..d302c1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7865cae76201fb340baa3467a0488541 hawaii-shell-0.6.0.tar.xz +280e5362e34f58201f7b668257e11235 hawaii-shell-0.6.90.tar.xz