- updated to 1.2.5

- xf86misc support disabled by default

diff --git a/xorg-app-xset.spec b/xorg-app-xset.spec
index 31af8f7b02ce028bfe866880f431af18c9b37ee3..46450123abf3714eba0c22ced15eb048654cb20d 100644 (file)
--- a/xorg-app-xset.spec
+++ b/xorg-app-xset.spec
@@ -1,24 +1,30 @@
+#
+# Conditional build:
+%bcond_with    xf86misc        # XF86-Misc extensions support (xserver < 1.6)
+
 Summary:       xset application - user preference utility for X
 Summary(pl.UTF-8):     Aplikacja xset - narzędzie do ustawień użytkownika dla X
 Name:          xorg-app-xset
-Version:       1.2.4
+Version:       1.2.5
 Release:       1
 License:       MIT
 Group:         X11/Applications
-Source0:       https://xorg.freedesktop.org/releases/individual/app/xset-%{version}.tar.bz2
-# Source0-md5: 70ea7bc7bacf1a124b1692605883f620
+Source0:       https://xorg.freedesktop.org/releases/individual/app/xset-%{version}.tar.xz
+# Source0-md5: 18ff5cdff59015722431d568a5c0bad2
 URL:           https://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: pkgconfig >= 1:0.19
+BuildRequires: tar >= 1:1.22
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXext-devel
 # just xmuu
 BuildRequires: xorg-lib-libXmu-devel
-BuildRequires: xorg-lib-libXxf86misc-devel
+%{?with_xf86misc:BuildRequires:        xorg-lib-libXxf86misc-devel}
 BuildRequires: xorg-lib-libXfontcache-devel
 BuildRequires: xorg-proto-xproto-devel >= 7.0.17
 BuildRequires: xorg-util-util-macros >= 1.8
+BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,7 +43,8 @@ użytkownika.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       %{?with_xf86misc:--with-xf86misc}
 
 %{__make}
 
@@ -52,6 +59,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README
+%doc COPYING ChangeLog README.md
 %attr(755,root,root) %{_bindir}/xset
 %{_mandir}/man1/xset.1*