diff --git a/.gitignore b/.gitignore index 4703c82..e118404 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,3 @@ xfdesktop-4.6.2.tar.bz2 /xfdesktop-4.16.1.tar.bz2 /xfdesktop-4.18.0.tar.bz2 /xfdesktop-4.18.1.tar.bz2 -/xfdesktop-4.20.0.tar.bz2 -/xfdesktop-4.20.1.tar.bz2 -/xfdesktop-4.20.2.tar.bz2 diff --git a/sources b/sources index ad2a6d4..a537806 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfdesktop-4.20.2.tar.bz2) = 396b22246b18cf15a3eea19e6dfe469fa2cb0397164c6bc2bc61b6db8289bfc6e6613cfb0193198efc091c7098370ec7d99f79b183a2c087311349c147eaf982 +SHA512 (xfdesktop-4.18.1.tar.bz2) = cafb1e274bbabf1704a6452532fc79657af26eaf92a58374f87a70f31c35fbf213319c6658b3d18bfca2d555b69e07e46949407d1f80e5a37f48e76bbde9dc3e diff --git a/xfdesktop.spec b/xfdesktop.spec index c040ed7..6e770c8 100644 --- a/xfdesktop.spec +++ b/xfdesktop.spec @@ -1,12 +1,11 @@ -%global xfceversion 4.20 +%global xfceversion 4.18 Name: xfdesktop -Version: 4.20.2 +Version: 4.18.1 Release: %autorelease Summary: Desktop manager for the Xfce Desktop Environment -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ URL: http://www.xfce.org/ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}-%{version}.tar.bz2 @@ -22,18 +21,15 @@ BuildRequires: garcon-devel >= 0.1.2 BuildRequires: libwnck3-devel >= 3.14 BuildRequires: libnotify-devel >= 0.4.0 BuildRequires: xfconf-devel >= %{xfceversion} -BuildRequires: libyaml-devel BuildRequires: intltool BuildRequires: desktop-file-utils BuildRequires: libSM-devel BuildRequires: libICE-devel -BuildRequires: libxfce4windowing-devel - Requires: xfwm4 >= %{xfceversion} Requires: xfce4-panel >= %{xfceversion} Requires: redhat-menus Requires: desktop-backgrounds-compat -%if 0%{?fedora} >= 37 && 0%{?fedora} < 43 +%if 0%{fedora}>= 37 Requires: webp-pixbuf-loader%{?_isa} %endif @@ -43,8 +39,15 @@ This package includes a desktop manager for the Xfce Desktop Environment. %prep %setup -q +# change default background for Fedora +%if 0%{fedora} >= 37 +sed -i 's|/backgrounds/xfce/xfce-verticals.png|/backgrounds/images/default.webp|' common/xfdesktop-common.h +%else +sed -i 's|/backgrounds/xfce/xfce-verticals.png|/backgrounds/images/default.png|' common/xfdesktop-common.h +%endif + %build -%configure --with-default-backdrop-filename=%{_datadir}/backgrounds/images/default.jxl +%configure %make_build @@ -60,7 +63,7 @@ desktop-file-validate \ %files -f %{name}.lang %license COPYING -%doc ChangeLog NEWS AUTHORS +%doc TODO ChangeLog NEWS AUTHORS %{_bindir}/* %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/*/*