diff --git a/.gitignore b/.gitignore index 1836368..72e40c8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ enlightenment-0.16.999.49898.tar.bz2 /enlightenment-0.22.4.tar.xz /enlightenment-0.23.0.tar.xz /enlightenment-0.23.1.tar.xz +/enlightenment-0.24.0.tar.xz diff --git a/enlightenment.spec b/enlightenment.spec index 0d91834..459bb21 100644 --- a/enlightenment.spec +++ b/enlightenment.spec @@ -1,57 +1,59 @@ -%global use_wayland 0 - -Name: enlightenment -Version: 0.23.1 -Release: 3%{?dist} -License: BSD -Summary: Enlightenment window manager -Url: http://enlightenment.org -Source0: http://download.enlightenment.org/rel/apps/enlightenment/%{name}-%{version}.tar.xz +%global use_wayland 1 + +Name: enlightenment +Version: 0.24.0 +Release: 1%{?dist} +License: BSD +Summary: Enlightenment window manager +Url: http://enlightenment.org +Source0: http://download.enlightenment.org/rel/apps/enlightenment/%{name}-%{version}.tar.xz Patch0: enlightenment-0.22.30-fix-desktop-files.patch -# gcc 10 (-fno-common) -# https://phab.enlightenment.org/D11260 -Patch1: enlightenment-0.23.1-gcc10.patch -BuildRequires: gcc, gcc-c++ -BuildRequires: alsa-lib-devel +BuildRequires: gcc, gcc-c++ +BuildRequires: alsa-lib-devel BuildRequires: bluez-libs-devel -BuildRequires: dbus-devel -BuildRequires: desktop-file-utils -BuildRequires: doxygen -BuildRequires: efl-devel >= 0.22.3 +BuildRequires: dbus-devel +BuildRequires: desktop-file-utils +BuildRequires: doxygen +BuildRequires: efl-devel >= 1.24.1 %if %{use_wayland} -BuildRequires: libwayland-server-devel +BuildRequires: wayland-protocols-devel +BuildRequires: wayland-devel +BuildRequires: xorg-x11-server-Xwayland %endif -BuildRequires: libXext-devel -BuildRequires: pam-devel +BuildRequires: libdrm-devel +BuildRequires: libuuid-devel +BuildRequires: libXext-devel +BuildRequires: pam-devel BuildRequires: systemd -BuildRequires: xcb-util-keysyms-devel -BuildRequires: pulseaudio-libs-devel -BuildRequires: ninja-build, meson -Requires: %{name}-data = %{version}-%{release} -Requires: efl -Requires: redhat-menus -Provides: firstboot(windowmanager) = enlightenment -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +BuildRequires: xcb-util-keysyms-devel +BuildRequires: pulseaudio-libs-devel +BuildRequires: ninja-build, meson +BuildRequires: xkeyboard-config-devel +Requires: %{name}-data = %{version}-%{release} +Requires: efl +Requires: redhat-menus +Provides: firstboot(windowmanager) = enlightenment +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description -Enlightenment window manager is a lean, fast, modular and very extensible window -manager for X11 and Linux. It is classed as a "desktop shell" providing the +Enlightenment window manager is a lean, fast, modular and very extensible window +manager for X11 and Linux. It is classed as a "desktop shell" providing the things you need to operate your desktop (or laptop), but is not a whole ' -application suite. This covered launching applications, managing their windows -and doing other system tasks like suspending, reboots, managing files etc. +application suite. This covered launching applications, managing their windows +and doing other system tasks like suspending, reboots, managing files etc. -%package data -Summary: Enlightenment data files -Requires: %{name} = %{version}-%{release} -BuildArch: noarch +%package data +Summary: Enlightenment data files +Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description data Contains data files for Enlightenment -%package devel -Summary: Enlightenment headers, documentation and test programs +%package devel +Summary: Enlightenment headers, documentation and test programs Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -60,7 +62,6 @@ Headers, test programs and documentation for enlightenment. %prep %setup -q %patch0 -p1 -b .fixme -%patch1 -p1 -b .gcc10 %build %{meson} \ @@ -91,6 +92,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %files %doc AUTHORS COPYING README NEWS +%dir %{_sysconfdir}/enlightenment +%config %{_sysconfdir}/enlightenment/system.conf %{_sysconfdir}/xdg/menus/e-applications.menu %{_sysconfdir}/enlightenment/sysactions.conf %{_bindir}/emixer @@ -102,12 +105,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_bindir}/enlightenment_remote %{_bindir}/enlightenment_start %{_libdir}/enlightenment -%{_datadir}/pixmaps/emixer.png +%{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/places/* %{_datadir}/pixmaps/enlightenment-askpass.png %{_userunitdir}/enlightenment.service %files data -f %{name}.lang +%if %{use_wayland} %{_datadir}/wayland-sessions/enlightenment.desktop +%endif %{_datadir}/xsessions/enlightenment.desktop %{_datadir}/enlightenment %{_datadir}/applications/*.desktop @@ -117,6 +123,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop %{_includedir}/enlightenment %changelog +* Mon May 18 2020 Tom Callaway - 0.24.0-1 +- update to 0.24.0 +- turn wayland support on + * Fri Jan 31 2020 Tom Callaway - 0.23.1-3 - fix FTBFS diff --git a/sources b/sources index b10813d..3df26ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (enlightenment-0.23.1.tar.xz) = b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb +SHA512 (enlightenment-0.24.0.tar.xz) = 7255ec5c2e85143df8d92e37456f5392feb3a264daa81ec6b10ae57886d714c524869392ddc753914f3a9c5fd71e1b2c5dd1d1e1f7a5a649fb6aaaed81214b95