diff --git a/.gitignore b/.gitignore index ba9c3b7..16f9e4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,37 @@ -/xfce4-settings-*.tar.bz2 +xfce4-settings-4.6.5.tar.bz2 +/xfce4-settings-4.7.7.tar.bz2 +/xfce4-settings-4.8.0.tar.bz2 +/xfce4-settings-4.8.1.tar.bz2 +/xfce4-settings-4.8.2.tar.bz2 +/xfce4-settings-4.8.3.tar.bz2 +/xfce4-settings-4.9.4.tar.bz2 +/xfce4-settings-4.9.5.tar.bz2 +/xfce4-settings-4.10.0.tar.bz2 +/xfce4-settings-4.10.1.tar.bz2 +/xfce4-settings-4.12.0.tar.bz2 +/xfce4-settings-4.12.1.tar.bz2 +/xfce4-settings-4.12.2.tar.bz2 +/xfce4-settings-4.12.3.tar.bz2 +/xfce4-settings-4.12.4.tar.bz2 +/xfce4-settings-4.13.4.tar.bz2 +/xfce4-settings-4.13.5.tar.bz2 +/xfce4-settings-4.13.6.tar.bz2 +/xfce4-settings-4.13.7.tar.bz2 +/xfce4-settings-4.13.8.tar.bz2 +/xfce4-settings-4.14.0.tar.bz2 +/xfce4-settings-4.14.1.tar.bz2 +/xfce4-settings-4.14.2.tar.bz2 +/xfce4-settings-4.14.3.tar.bz2 +/xfce4-settings-4.16.0.tar.bz2 +/xfce4-settings-4.16.1.tar.bz2 +/xfce4-settings-4.16.2.tar.bz2 +/xfce4-settings-4.16.3.tar.bz2 +/xfce4-settings-4.16.5.tar.bz2 +/xfce4-settings-4.18.1.tar.bz2 +/xfce4-settings-4.18.2.tar.bz2 +/xfce4-settings-4.18.3.tar.bz2 +/xfce4-settings-4.18.4.tar.bz2 +/xfce4-settings-4.18.6.tar.bz2 +/xfce4-settings-4.20.0.tar.bz2 +/xfce4-settings-4.20.1.tar.bz2 +/xfce4-settings-4.20.2.tar.bz2 diff --git a/sources b/sources index 9cdf312..e029909 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfce4-settings-4.20.5.tar.bz2) = 99ec7f585029f10d90d462b7dc57376786952b6c92ff80a174195cbc4b89989191c8363fd4f359a99eb5bfc2e10dc411961ab331f1f8c6911c6b3e32d7ab448e +SHA512 (xfce4-settings-4.20.2.tar.bz2) = d765eee47617d11f286e35679bf3c6596328ddbe8e5cfef7d55dc55d78f1ef4b7d3d10f22de9f2b79a2acce8193bb90a35259a8b577f2825715ce8b69e98e257 diff --git a/xfce4-settings.spec b/xfce4-settings.spec index aee34d0..765b798 100644 --- a/xfce4-settings.spec +++ b/xfce4-settings.spec @@ -1,7 +1,7 @@ %global xfceversion 4.20 Name: xfce4-settings -Version: 4.20.5 +Version: 4.20.2 Release: %autorelease Summary: Settings Manager for Xfce @@ -13,26 +13,24 @@ Source0: http://archive.xfce.org/src/xfce/%{name}/%{xfceversion}/%{name}- # Use Fedora theme and font settings Patch10: xfce4-settings-%{xfceversion}-fedora.patch -BuildRequires: colord-devel -BuildRequires: desktop-file-utils >= 0.7 -BuildRequires: exo-devel >= 0.5.0 -BuildRequires: garcon-devel >= %{xfceversion} +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: gettext -BuildRequires: gtk-layer-shell-devel BuildRequires: intltool -BuildRequires: libXrandr-devel -BuildRequires: libcanberra-devel -BuildRequires: libnotify-devel +BuildRequires: exo-devel >= 0.5.0 BuildRequires: libxfce4ui-devel >= %{xfceversion} BuildRequires: libxfce4util-devel >= %{xfceversion} -BuildRequires: libxklavier-devel -BuildRequires: make BuildRequires: xfconf-devel >= %{xfceversion} +BuildRequires: desktop-file-utils >= 0.7 +BuildRequires: libnotify-devel +BuildRequires: colord-devel +BuildRequires: libcanberra-devel +BuildRequires: libxklavier-devel %ifnarch s390 s390x BuildRequires: xorg-x11-drv-libinput-devel %endif - +BuildRequires: libXrandr-devel +BuildRequires: garcon-devel >= %{xfceversion} Requires: xfconf %if 0%{?rhel} <= 7 Requires: gnome-icon-theme @@ -42,18 +40,17 @@ Requires: gnome-icon-theme This package includes the settings manager applications for the Xfce desktop. %prep -%autosetup -p0 +%setup -q +%patch 10 + %build -%configure --enable-sound-settings --enable-xorg-libinput +%configure --enable-sound-settings --enable-pluggable-dialogs --enable-maintainer-mode --enable-xorg-libinput %make_build %install %make_install -# Remove invalid locale directory to silence rpmlint -rm -rf %{buildroot}%{_datadir}/locale/hye - for file in %{buildroot}%{_datadir}/applications/*.desktop ; do desktop-file-install \ --add-category="X-XFCE" \ @@ -63,6 +60,7 @@ for file in %{buildroot}%{_datadir}/applications/*.desktop ; do $file done + %find_lang %{name} %files -f %{name}.lang