From c6995759c6c469709ed6ec98e2014b9c6f224ceff7d9ce4d35131ebef9754e75 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 4 Apr 2018 14:52:18 +0000 Subject: [PATCH] - Update to version 1.2.4 * configure: Drop AM_MAINTAINER_MODE * autogen.sh: Honor NOCONFIGURE=1 * autogen.sh: use quoted string variables * Include unistd.h for usleep() if HAVE_USLEEP * Fix one last warning about usage() format string. * autogen: add default patch prefix * autogen.sh: use exec instead of waiting for configure to finish - supersedes U_xset_fix-warning-about-usage-format-string.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xset?expand=0&rev=9 --- ...ix-warning-about-usage-format-string.patch | 24 ------------------- xset-1.2.3.tar.bz2 | 3 --- xset-1.2.4.tar.bz2 | 3 +++ xset.changes | 13 ++++++++++ xset.spec | 6 ++--- 5 files changed, 18 insertions(+), 31 deletions(-) delete mode 100644 U_xset_fix-warning-about-usage-format-string.patch delete mode 100644 xset-1.2.3.tar.bz2 create mode 100644 xset-1.2.4.tar.bz2 diff --git a/U_xset_fix-warning-about-usage-format-string.patch b/U_xset_fix-warning-about-usage-format-string.patch deleted file mode 100644 index 4eb4b68..0000000 --- a/U_xset_fix-warning-about-usage-format-string.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c3ce2c28deac121db0de50af63c902e5883fe140 Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb -Date: Sat, 17 Aug 2013 18:25:49 +0200 -Subject: Fix one last warning about usage() format string. - -Signed-off-by: Matthieu Herrb -Reviewed-by: Alan Coopersmith - -diff --git a/xset.c b/xset.c -index f461d4b..98f552f 100644 ---- a/xset.c -+++ b/xset.c -@@ -325,8 +325,7 @@ main(int argc, char *argv[]) - usage("low-mark must be greater than 0"); - } - if (himark <= lowmark) { -- usage("hi-mark must be greater than low-mark", -- NULL); -+ usage("hi-mark must be greater than low-mark"); - } - if (i >= argc) { - set_font_cache(dpy, himark, lowmark, balance); --- -cgit v0.10.2 diff --git a/xset-1.2.3.tar.bz2 b/xset-1.2.3.tar.bz2 deleted file mode 100644 index 7d1eae9..0000000 --- a/xset-1.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063 -size 142286 diff --git a/xset-1.2.4.tar.bz2 b/xset-1.2.4.tar.bz2 new file mode 100644 index 0000000..5ee52d1 --- /dev/null +++ b/xset-1.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957 +size 145546 diff --git a/xset.changes b/xset.changes index 0a77c09..a89063f 100644 --- a/xset.changes +++ b/xset.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Apr 4 14:47:54 UTC 2018 - sndirsch@suse.com + +- Update to version 1.2.4 + * configure: Drop AM_MAINTAINER_MODE + * autogen.sh: Honor NOCONFIGURE=1 + * autogen.sh: use quoted string variables + * Include unistd.h for usleep() if HAVE_USLEEP + * Fix one last warning about usage() format string. + * autogen: add default patch prefix + * autogen.sh: use exec instead of waiting for configure to finish +- supersedes U_xset_fix-warning-about-usage-format-string.patch + ------------------------------------------------------------------- Mon Nov 20 23:27:49 UTC 2017 - zaitor@opensuse.org diff --git a/xset.spec b/xset.spec index b9257d2..4407c2e 100644 --- a/xset.spec +++ b/xset.spec @@ -1,7 +1,7 @@ # # spec file for package xset # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: xset -Version: 1.2.3 +Version: 1.2.4 Release: 0 Summary: User preference utility for X License: MIT Group: System/X11/Utilities Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 -Patch0: U_xset_fix-warning-about-usage-format-string.patch BuildRequires: pkg-config BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) @@ -43,7 +42,6 @@ display. %prep %setup -q -%patch0 -p1 %build %configure