Compare commits
No commits in common. "9070b23296488780c36fab7f642e779bd21466a6" and "c6662e0984735ee4895c6b6177cf4dc00ecb12b6" have entirely different histories.
9070b23296
...
c6662e0984
12
.gitignore
vendored
12
.gitignore
vendored
@ -1,12 +0,0 @@
|
|||||||
/rgb-.*.tar.bz2
|
|
||||||
/xmodmap-.*.tar.bz2
|
|
||||||
/xgamma-.*.tar.bz2
|
|
||||||
/xhost-.*.tar.bz2
|
|
||||||
/xinput-.*.tar.bz2
|
|
||||||
/xrandr-.*.tar.bz2
|
|
||||||
/xkill-.*.tar.bz2
|
|
||||||
/xrdb-.*.tar.bz2
|
|
||||||
/xset-.*.tar.bz2
|
|
||||||
/xsetroot-.*.tar.bz2
|
|
||||||
/xinput-.*.tar.bz2
|
|
||||||
/xisxwayland-.*.tar.xz
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
2ce23c40a17d98badeb8ce70d26e81a5ac0e178c iceauth-1.0.8.tar.bz2
|
|
||||||
542fade81a74f8a6beaea8cb517bdf1033fc6b71 rgb-1.0.6.tar.bz2
|
|
||||||
a27a476f7f39ae30a16dfa25ca07c12378cff7f0 sessreg-1.1.0.tar.bz2
|
|
||||||
af1484d0d70bc71dc9d3b7b95645881b7165c41b xgamma-1.0.6.tar.bz2
|
|
||||||
8abfb0554e14a074f0dbfdda4919880e088545cb xhost-1.0.7.tar.bz2
|
|
||||||
92ea7dfb3d8465921b0dca85da7d5b01cedae6c8 xinput-1.6.3.tar.bz2
|
|
||||||
c5ee06b33adb252a41e4f737be6bd47651ff582a xkill-1.0.5.tar.bz2
|
|
||||||
fe735c8bbba68d7eb50f82d4e092fdcadf161314 xmodmap-1.0.9.tar.bz2
|
|
||||||
f402b2ed85817c2e111afafd6f5d0657328be2fa xrandr-1.5.0.tar.bz2
|
|
||||||
0d6b1cae357574d565d6e6bc10f6ccf073e1b9dd xrdb-1.1.1.tar.bz2
|
|
||||||
11eb5b3f905631281d2cedd86a0b666bab0d9bdc xrefresh-1.0.6.tar.bz2
|
|
||||||
41a857f30ff5bb0dfbda1549bb703984344ea228 xset-1.2.4.tar.bz2
|
|
||||||
a8b01c6f27625a6f6943f9be17b1e5511f69d710 xsetpointer-1.0.1.tar.bz2
|
|
||||||
42ab81761823b44974feab86477007c49dbace50 xsetroot-1.1.2.tar.bz2
|
|
||||||
b7fcc50ae6100d2ba91d6847969fd9d2b6784a90 xstdcmap-1.0.3.tar.bz2
|
|
||||||
bc8e1cfc92f6d7de1f30f44a7105e811486893eb xisxwayland-1.tar.xz
|
|
||||||
@ -1,107 +0,0 @@
|
|||||||
From c52a3a649fa5366f6933cdbaff331361dfd638c7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
||||||
Date: Wed, 12 Sep 2018 14:46:05 +1000
|
|
||||||
Subject: [PATCH app/sessreg] Replace strncpy calls with a sane version that
|
|
||||||
always terminates
|
|
||||||
|
|
||||||
Fixes coverity complaints about potentially unterminated strings
|
|
||||||
---
|
|
||||||
sessreg.c | 28 ++++++++++++++++++----------
|
|
||||||
1 file changed, 18 insertions(+), 10 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/sessreg.c b/sessreg.c
|
|
||||||
index 0a8fdb2..7725bcc 100644
|
|
||||||
--- a/sessreg.c
|
|
||||||
+++ b/sessreg.c
|
|
||||||
@@ -192,6 +192,14 @@ sysnerr (int x, const char *s)
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void
|
|
||||||
+safe_strncpy(char *dest, const char *src, size_t n)
|
|
||||||
+{
|
|
||||||
+ (void)strncpy(dest, src, n);
|
|
||||||
+ if (n > 0)
|
|
||||||
+ dest[n - 1] = '\0';
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
int
|
|
||||||
main (int argc, char **argv)
|
|
||||||
{
|
|
||||||
@@ -406,9 +414,9 @@ main (int argc, char **argv)
|
|
||||||
memset(&ll, 0, sizeof(ll));
|
|
||||||
ll.ll_time = current_time;
|
|
||||||
if (line)
|
|
||||||
- (void) strncpy (ll.ll_line, line, sizeof (ll.ll_line));
|
|
||||||
+ safe_strncpy (ll.ll_line, line, sizeof (ll.ll_line));
|
|
||||||
if (host_name)
|
|
||||||
- (void) strncpy (ll.ll_host, host_name, sizeof (ll.ll_host));
|
|
||||||
+ safe_strncpy (ll.ll_host, host_name, sizeof (ll.ll_host));
|
|
||||||
|
|
||||||
sysnerr (write (llog, (char *) &ll, sizeof (ll))
|
|
||||||
== sizeof (ll), "write lastlog entry");
|
|
||||||
@@ -429,11 +437,11 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a
|
|
||||||
{
|
|
||||||
memset (u, 0, sizeof (*u));
|
|
||||||
if (line)
|
|
||||||
- (void) strncpy (u->ut_line, line, sizeof (u->ut_line));
|
|
||||||
+ safe_strncpy (u->ut_line, line, sizeof (u->ut_line));
|
|
||||||
else
|
|
||||||
memset (u->ut_line, 0, sizeof (u->ut_line));
|
|
||||||
if (addp && user)
|
|
||||||
- (void) strncpy (u->ut_name, user, sizeof (u->ut_name));
|
|
||||||
+ safe_strncpy (u->ut_name, user, sizeof (u->ut_name));
|
|
||||||
else
|
|
||||||
memset (u->ut_name, 0, sizeof (u->ut_name));
|
|
||||||
#ifdef HAVE_STRUCT_UTMP_UT_ID
|
|
||||||
@@ -451,7 +459,7 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a
|
|
||||||
i -= sizeof (u->ut_id);
|
|
||||||
else
|
|
||||||
i = 0;
|
|
||||||
- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id));
|
|
||||||
+ safe_strncpy (u->ut_id, line + i, sizeof (u->ut_id));
|
|
||||||
} else
|
|
||||||
memset (u->ut_id, 0, sizeof (u->ut_id));
|
|
||||||
#endif
|
|
||||||
@@ -469,7 +477,7 @@ set_utmp (struct utmp *u, char *line, char *user, char *host, time_t date, int a
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_STRUCT_UTMP_UT_HOST
|
|
||||||
if (addp && host)
|
|
||||||
- (void) strncpy (u->ut_host, host, sizeof (u->ut_host));
|
|
||||||
+ safe_strncpy (u->ut_host, host, sizeof (u->ut_host));
|
|
||||||
else
|
|
||||||
memset (u->ut_host, 0, sizeof (u->ut_host));
|
|
||||||
#endif
|
|
||||||
@@ -513,9 +521,9 @@ set_utmpx (struct utmpx *u, const char *line, const char *user,
|
|
||||||
if(strcmp(line, ":0") == 0)
|
|
||||||
(void) strcpy(u->ut_line, "console");
|
|
||||||
else
|
|
||||||
- (void) strncpy (u->ut_line, line, sizeof (u->ut_line));
|
|
||||||
+ safe_strncpy (u->ut_line, line, sizeof (u->ut_line));
|
|
||||||
|
|
||||||
- strncpy(u->ut_host, line, sizeof(u->ut_host));
|
|
||||||
+ safe_strncpy(u->ut_host, line, sizeof(u->ut_host));
|
|
||||||
#ifdef HAVE_STRUCT_UTMPX_UT_SYSLEN
|
|
||||||
u->ut_syslen = strlen(line);
|
|
||||||
#endif
|
|
||||||
@@ -523,7 +531,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user,
|
|
||||||
else
|
|
||||||
memset (u->ut_line, 0, sizeof (u->ut_line));
|
|
||||||
if (addp && user)
|
|
||||||
- (void) strncpy (u->ut_user, user, sizeof (u->ut_user));
|
|
||||||
+ safe_strncpy (u->ut_user, user, sizeof (u->ut_user));
|
|
||||||
else
|
|
||||||
memset (u->ut_user, 0, sizeof (u->ut_user));
|
|
||||||
|
|
||||||
@@ -541,7 +549,7 @@ set_utmpx (struct utmpx *u, const char *line, const char *user,
|
|
||||||
i -= sizeof (u->ut_id);
|
|
||||||
else
|
|
||||||
i = 0;
|
|
||||||
- (void) strncpy (u->ut_id, line + i, sizeof (u->ut_id));
|
|
||||||
+ safe_strncpy (u->ut_id, line + i, sizeof (u->ut_id));
|
|
||||||
|
|
||||||
/* make sure there is no entry using identical ut_id */
|
|
||||||
if (!UtmpxIdOpen(u->ut_id) && addp) {
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From a2134406ab0aef44e7b710e1e2a2a40965e96692 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Peter Hutterer <peter.hutterer@who-t.net>
|
|
||||||
Date: Thu, 13 Sep 2018 09:44:16 +1000
|
|
||||||
Subject: [PATCH app/xrandr] init the name to 0
|
|
||||||
|
|
||||||
There are a few conditions where coverity finds a use of an uninitialized
|
|
||||||
field of the name_t struct. These are rather messy combinations of conditions,
|
|
||||||
so let's go with the simple solution here and just init everything to 0.
|
|
||||||
This may still have side-effects but at least they'll be more obvious than the
|
|
||||||
previous "use whatever memory is leftover from breakfast".
|
|
||||||
|
|
||||||
This patch also adds a missing init_name(), much for the same reason.
|
|
||||||
|
|
||||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
||||||
---
|
|
||||||
xrandr.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/xrandr.c b/xrandr.c
|
|
||||||
index 7f1e867..ce3cd91 100644
|
|
||||||
--- a/xrandr.c
|
|
||||||
+++ b/xrandr.c
|
|
||||||
@@ -637,6 +637,7 @@ print_verbose_mode (const XRRModeInfo *mode, Bool current, Bool preferred)
|
|
||||||
static void
|
|
||||||
init_name (name_t *name)
|
|
||||||
{
|
|
||||||
+ memset(name, 0, sizeof(*name));
|
|
||||||
name->kind = name_none;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1822,6 +1823,7 @@ get_outputs (void)
|
|
||||||
output_t *output;
|
|
||||||
name_t output_name;
|
|
||||||
if (!output_info) fatal ("could not get output 0x%lx information\n", res->outputs[o]);
|
|
||||||
+ init_name(&output_name);
|
|
||||||
set_name_xid (&output_name, res->outputs[o]);
|
|
||||||
set_name_index (&output_name, o);
|
|
||||||
set_name_string (&output_name, output_info->name);
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
From 215a01f1513f918e7295a8a477d4674f7b8085f0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
|
|
||||||
Date: Wed, 18 Jan 2017 08:52:23 +0100
|
|
||||||
Subject: [PATCH app/xrandr] xrandr: suppress misleading indentation warning
|
|
||||||
|
|
||||||
When printing out rotations, we print a space before any item other than
|
|
||||||
the first, and set `first = False` in each block where we print.
|
|
||||||
However, this is done in the same line as the conditional that checks if
|
|
||||||
first is set, which may give the impression that the assignment is also
|
|
||||||
under the conditional. This is not the case, and recent GCC warns about
|
|
||||||
this.
|
|
||||||
|
|
||||||
Move the assignment to after we print the value we want to print, which
|
|
||||||
(1) doesn't mislead about the indentation, and
|
|
||||||
(2) makes logical sense as the _next_ entry is what won't be the first.
|
|
||||||
|
|
||||||
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
|
|
||||||
---
|
|
||||||
xrandr.c | 6 ++++--
|
|
||||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/xrandr.c b/xrandr.c
|
|
||||||
index dcfdde0..2aad946 100644
|
|
||||||
--- a/xrandr.c
|
|
||||||
+++ b/xrandr.c
|
|
||||||
@@ -3703,14 +3703,16 @@ main (int argc, char **argv)
|
|
||||||
printf (" (");
|
|
||||||
for (i = 0; i < 4; i ++) {
|
|
||||||
if ((rotations >> i) & 1) {
|
|
||||||
- if (!first) printf (" "); first = False;
|
|
||||||
+ if (!first) printf (" ");
|
|
||||||
printf("%s", direction[i]);
|
|
||||||
+ first = False;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (rotations & RR_Reflect_X)
|
|
||||||
{
|
|
||||||
- if (!first) printf (" "); first = False;
|
|
||||||
+ if (!first) printf (" ");
|
|
||||||
printf ("x axis");
|
|
||||||
+ first = False;
|
|
||||||
}
|
|
||||||
if (rotations & RR_Reflect_Y)
|
|
||||||
{
|
|
||||||
--
|
|
||||||
2.17.1
|
|
||||||
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
||||||
16
sources
16
sources
@ -1,16 +0,0 @@
|
|||||||
SHA512 (iceauth-1.0.8.tar.bz2) = 9d4520adf951b16a3e784349dbb70d5d8176b74b956f8adc63abf55d049745c113b03ccfa60a281fc39b487db3742302dc6287c9985ce83a0157bf4674df2af1
|
|
||||||
SHA512 (rgb-1.0.6.tar.bz2) = 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e
|
|
||||||
SHA512 (sessreg-1.1.0.tar.bz2) = 5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116
|
|
||||||
SHA512 (xgamma-1.0.6.tar.bz2) = 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a
|
|
||||||
SHA512 (xhost-1.0.7.tar.bz2) = 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7
|
|
||||||
SHA512 (xinput-1.6.3.tar.bz2) = cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076
|
|
||||||
SHA512 (xkill-1.0.5.tar.bz2) = 4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249
|
|
||||||
SHA512 (xmodmap-1.0.9.tar.bz2) = 6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac
|
|
||||||
SHA512 (xrandr-1.5.0.tar.bz2) = 11d8fb1b98fbe215555d5bb875d82f80a7fd6a61c93ebf175c226f4f747570e8d18980add54a4b88d20dc637155074b2a558b34f035d66a465f324281d65f9e4
|
|
||||||
SHA512 (xrdb-1.1.1.tar.bz2) = 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f
|
|
||||||
SHA512 (xrefresh-1.0.6.tar.bz2) = 361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674
|
|
||||||
SHA512 (xset-1.2.4.tar.bz2) = f24714c9a82081a09d3054bbad98553de9366992f22eaf3e2bcadbb58fad1d3dad2547fef6fa9898d8a9df064573c29df9d82a5c801fa92248604c95f65dc83d
|
|
||||||
SHA512 (xsetpointer-1.0.1.tar.bz2) = 1a462f70dde10c6ce92432440a9e718ba231c49ecbf68f0c2fd2276862edc4e9cd0dd5b6d71ad169b30e4cac7110278e4c8ed48eedd1d6cc0d1bd5e322bbcf58
|
|
||||||
SHA512 (xsetroot-1.1.2.tar.bz2) = 0b9df1b72305e5c24f1e1664578aa4411a5ffcdc5d318458117594e641f01c34700205b0d16c08abf4a8106d36128ccdbe1ea1f1035fce9018d6b52801a8b72b
|
|
||||||
SHA512 (xstdcmap-1.0.3.tar.bz2) = 8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49
|
|
||||||
SHA512 (xisxwayland-1.tar.xz) = 9514442313cff4df0c71fed445ba0e3fe52f3c84ebbec81725a590f68cc42ea01ac96b23736a0108fe206da3aee48434c5c30d1c58905bfc75db35205c288bca
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
from Config import *
|
|
||||||
addFilter("spelling-error .* txt");
|
|
||||||
@ -1,372 +0,0 @@
|
|||||||
# doesn't work yet, needs more nickle bindings
|
|
||||||
%global with_xkeystone 0
|
|
||||||
|
|
||||||
# Component versions
|
|
||||||
%global rgb 1.0.6
|
|
||||||
%global xgamma 1.0.6
|
|
||||||
%global xhost 1.0.7
|
|
||||||
%global xinput 1.6.3
|
|
||||||
%global xkill 1.0.5
|
|
||||||
%global xmodmap 1.0.9
|
|
||||||
%global xrandr 1.5.0
|
|
||||||
%global xrdb 1.1.1
|
|
||||||
%global xset 1.2.4
|
|
||||||
%global xsetroot 1.1.2
|
|
||||||
%global xisxwayland 1
|
|
||||||
|
|
||||||
Summary: X.Org X11 X server utilities
|
|
||||||
Name: xorg-x11-server-utils
|
|
||||||
Version: 7.7
|
|
||||||
Release: 44%{?dist}
|
|
||||||
License: MIT
|
|
||||||
URL: http://www.x.org
|
|
||||||
|
|
||||||
Source0: https://www.x.org/pub/individual/app/rgb-%{rgb}.tar.bz2
|
|
||||||
Source1: https://www.x.org/pub/individual/app/xgamma-%{xgamma}.tar.bz2
|
|
||||||
Source2: https://www.x.org/pub/individual/app/xhost-%{xhost}.tar.bz2
|
|
||||||
Source3: https://www.x.org/pub/individual/app/xinput-%{xinput}.tar.bz2
|
|
||||||
Source4: https://www.x.org/pub/individual/app/xkill-%{xkill}.tar.bz2
|
|
||||||
Source5: https://www.x.org/pub/individual/app/xmodmap-%{xmodmap}.tar.bz2
|
|
||||||
Source6: https://www.x.org/pub/individual/app/xrandr-%{xrandr}.tar.bz2
|
|
||||||
Source7: https://www.x.org/pub/individual/app/xrdb-%{xrdb}.tar.bz2
|
|
||||||
Source8: https://www.x.org/pub/individual/app/xset-%{xset}.tar.bz2
|
|
||||||
Source9: https://www.x.org/pub/individual/app/xsetroot-%{xsetroot}.tar.bz2
|
|
||||||
Source10: https://www.x.org/pub/individual/app/xisxwayland-%{xisxwayland}.tar.xz
|
|
||||||
|
|
||||||
Patch3: 0001-xrandr-suppress-misleading-indentation-warning.patch
|
|
||||||
Patch4: 0001-xrandr-init-the-name-to-0.patch
|
|
||||||
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: xorg-x11-util-macros
|
|
||||||
|
|
||||||
BuildRequires: pkgconfig(xbitmaps)
|
|
||||||
BuildRequires: pkgconfig(xcursor)
|
|
||||||
BuildRequires: pkgconfig(xext)
|
|
||||||
BuildRequires: pkgconfig(xi)
|
|
||||||
BuildRequires: pkgconfig(xinerama)
|
|
||||||
BuildRequires: pkgconfig(xmu)
|
|
||||||
BuildRequires: pkgconfig(xpm)
|
|
||||||
BuildRequires: pkgconfig(xrandr)
|
|
||||||
BuildRequires: pkgconfig(xrender)
|
|
||||||
BuildRequires: pkgconfig(xt)
|
|
||||||
BuildRequires: pkgconfig(xtrans)
|
|
||||||
BuildRequires: pkgconfig(xxf86vm)
|
|
||||||
|
|
||||||
BuildRequires: libtool
|
|
||||||
BuildRequires: meson
|
|
||||||
|
|
||||||
Provides: xgamma = %{xgamma}
|
|
||||||
Provides: xhost = %{xhost}
|
|
||||||
Provides: xinput = %{xinput}
|
|
||||||
Provides: xkill = %{xkill}
|
|
||||||
Provides: xmodmap = %{xmodmap}
|
|
||||||
Provides: xrandr = %{xrandr}
|
|
||||||
Provides: xrdb = %{xrdb}
|
|
||||||
Provides: xset = %{xset}
|
|
||||||
Provides: xsetroot = %{xsetroot}
|
|
||||||
Provides: xisxwayland = %{xisxwayland}
|
|
||||||
|
|
||||||
# RHEL doesn't need cpp for its internal xrdb usage, but some other desktops
|
|
||||||
# and customer environments still use it.
|
|
||||||
Recommends: cpp
|
|
||||||
|
|
||||||
%description
|
|
||||||
A collection of utilities used to tweak and query the runtime configuration of
|
|
||||||
the X server.
|
|
||||||
|
|
||||||
%package -n rgb
|
|
||||||
Summary: X color name database
|
|
||||||
Version: %{rgb}
|
|
||||||
# rgb subpackaged from xorg-x11-server-utils-7.7-33.fc32, bug #1268295
|
|
||||||
Conflicts: xorg-x11-server-utils < 7.7-33
|
|
||||||
|
|
||||||
%description -n rgb
|
|
||||||
This package includes both a list mapping X color names to RGB values
|
|
||||||
(rgb.txt) and an showrgb program to convert the text file into the source
|
|
||||||
format.
|
|
||||||
|
|
||||||
%if %{with_xkeystone}
|
|
||||||
%package -n xkeystone
|
|
||||||
Summary: X display keystone correction
|
|
||||||
Requires: nickle
|
|
||||||
|
|
||||||
%description -n xkeystone
|
|
||||||
Utility to perform keystone adjustments on X screens.
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10
|
|
||||||
pushd xrandr-%{xrandr}
|
|
||||||
%patch3 -p1
|
|
||||||
%patch4 -p1
|
|
||||||
popd
|
|
||||||
|
|
||||||
%build
|
|
||||||
|
|
||||||
# Build all apps
|
|
||||||
{
|
|
||||||
for app in * ; do
|
|
||||||
pushd $app
|
|
||||||
case $app in
|
|
||||||
xisxwayland-*)
|
|
||||||
%meson
|
|
||||||
%meson_build
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
autoreconf -vif
|
|
||||||
%configure --disable-silent-rules
|
|
||||||
make %{?_smp_mflags}
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
popd
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
%install
|
|
||||||
# Install all apps
|
|
||||||
{
|
|
||||||
for app in * ; do
|
|
||||||
pushd $app
|
|
||||||
case $app in
|
|
||||||
xisxwayland-*)
|
|
||||||
%meson_install
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
%make_install
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
popd
|
|
||||||
done
|
|
||||||
}
|
|
||||||
%if !%{with_xkeystone}
|
|
||||||
rm -f $RPM_BUILD_ROOT%{_bindir}/xkeystone
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%files
|
|
||||||
%doc
|
|
||||||
%{_bindir}/xgamma
|
|
||||||
%{_bindir}/xhost
|
|
||||||
%{_bindir}/xinput
|
|
||||||
%{_bindir}/xisxwayland
|
|
||||||
%{_bindir}/xkill
|
|
||||||
%{_bindir}/xmodmap
|
|
||||||
%{_bindir}/xrandr
|
|
||||||
%{_bindir}/xrdb
|
|
||||||
%{_bindir}/xset
|
|
||||||
%{_bindir}/xsetroot
|
|
||||||
%{_mandir}/man1/xgamma.1*
|
|
||||||
%{_mandir}/man1/xhost.1*
|
|
||||||
%{_mandir}/man1/xinput.1*
|
|
||||||
%{_mandir}/man1/xisxwayland.1*
|
|
||||||
%{_mandir}/man1/xkill.1*
|
|
||||||
%{_mandir}/man1/xmodmap.1*
|
|
||||||
%{_mandir}/man1/xrandr.1*
|
|
||||||
%{_mandir}/man1/xrdb.1*
|
|
||||||
%{_mandir}/man1/xset.1*
|
|
||||||
%{_mandir}/man1/xsetroot.1*
|
|
||||||
|
|
||||||
%files -n rgb
|
|
||||||
%{_bindir}/showrgb
|
|
||||||
%{_datadir}/X11/rgb.txt
|
|
||||||
%{_mandir}/man1/showrgb.1*
|
|
||||||
|
|
||||||
%if %{with_xkeystone}
|
|
||||||
%files -n xkeystone
|
|
||||||
%{_bindir}/xkeystone
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 7.7-44
|
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Tue May 04 2021 Adam Jackson <ajax@redhat.com> - 7.7-43
|
|
||||||
- Recommends: cpp for xrdb (#1954350)
|
|
||||||
|
|
||||||
* Tue May 04 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.7-42
|
|
||||||
- Prune obsolete/unused utilities (#1954355)
|
|
||||||
- Clean up the .gitignore file
|
|
||||||
|
|
||||||
* Thu Apr 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.7-41
|
|
||||||
- Drop mcpp from xrdb (#1954350)
|
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 7.7-40
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* Thu Feb 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 7.7-39
|
|
||||||
- Provide xisxwayland like all other utilities
|
|
||||||
|
|
||||||
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-38
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Nov 5 10:34:56 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 7.7-37
|
|
||||||
- Add BuildRequires for make
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-36
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue May 19 2020 Peter Hutterer <peter.hutterer@redhat.com> 7.7-35
|
|
||||||
- xisxwayland 1
|
|
||||||
|
|
||||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-34
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Sep 11 2019 Petr Pisar <ppisar@redhat.com> - 7.7-33
|
|
||||||
- Subpackage rgb (bug #1268295)
|
|
||||||
|
|
||||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-32
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 18 2019 Peter Hutterer <peter.hutterer@redhat.com> 7.7-31
|
|
||||||
- xinput 1.6.3
|
|
||||||
|
|
||||||
* Thu Jun 20 2019 Adam Jackson <ajax@redhat.com> - 7.7-30
|
|
||||||
- Drop BuildRequires: pkgconfig(xxf86misc), X servers haven't implemented that
|
|
||||||
extension in 10+ years.
|
|
||||||
|
|
||||||
* Thu Mar 21 2019 Adam Jackson <ajax@redhat.com> - 7.7-29
|
|
||||||
- Rebuild for xtrans 1.4.0
|
|
||||||
|
|
||||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-28
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Sep 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 7.7-27
|
|
||||||
- Fix a bunch of coverity warnings
|
|
||||||
- disable silent rules
|
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-26
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Mar 12 2018 Adam Jackson <ajax@redhat.com> - 7.7-25
|
|
||||||
- iceauth 1.0.8
|
|
||||||
- xkill 1.0.5
|
|
||||||
- xrdb 1.1.1
|
|
||||||
- xrefresh 1.0.6
|
|
||||||
- xset 1.2.4
|
|
||||||
- xsetroot 1.1.2
|
|
||||||
- HTTPS URLs
|
|
||||||
|
|
||||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-24
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-23
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-22
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-21
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Oct 26 2016 Peter Hutterer <peter.hutterer@redhat.com> 7.7-20
|
|
||||||
- Drop xsetmode. It's been broken for years
|
|
||||||
|
|
||||||
* Tue Feb 23 2016 Simone Caronni <negativo17@gmail.com> - 7.7-19
|
|
||||||
- xrandr 1.5.0
|
|
||||||
|
|
||||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.7-18
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 20 2016 Peter Hutterer <peter.hutterer@redhat.com>
|
|
||||||
- s/define/global/
|
|
||||||
|
|
||||||
* Tue Oct 20 2015 Peter Hutterer <peter.hutterer@redhat.com> 7.7-17
|
|
||||||
- xinput 1.6.2
|
|
||||||
|
|
||||||
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-16
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri May 01 2015 Simone Caronni <negativo17@gmail.com> - 7.7-15
|
|
||||||
- xgamma 1.0.6
|
|
||||||
- xhost 1.0.7
|
|
||||||
|
|
||||||
* Thu Apr 30 2015 Simone Caronni <negativo17@gmail.com> - 7.7-14
|
|
||||||
- xmodmap 1.0.9
|
|
||||||
- Fix FTBFS Fedora 22 on sessreg.
|
|
||||||
|
|
||||||
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 7.7-13
|
|
||||||
- Rebuilt for Fedora 23 Change
|
|
||||||
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
|
||||||
|
|
||||||
* Tue Jan 20 2015 Simone Caronni <negativo17@gmail.com> - 7.7-12
|
|
||||||
- Update sessreg to 1.1.0.
|
|
||||||
|
|
||||||
* Sat Jan 17 2015 Simone Caronni <negativo17@gmail.com> - 7.7-11
|
|
||||||
- Update iceauth to 1.0.7.
|
|
||||||
|
|
||||||
* Mon Nov 10 2014 Simone Caronni <negativo17@gmail.com> - 7.7-10
|
|
||||||
- rgb 1.0.6
|
|
||||||
|
|
||||||
* Thu Oct 23 2014 Simone Caronni <negativo17@gmail.com> - 7.7-9
|
|
||||||
- Clean up SPEC file, fix rpmlint warnings.
|
|
||||||
|
|
||||||
* Wed Oct 01 2014 Adam Jackson <ajax@redhat.com> 7.7-8
|
|
||||||
- xrandr 1.4.3
|
|
||||||
|
|
||||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jun 12 2014 Simone Caronni <negativo17@gmail.com> 7.7-6
|
|
||||||
- iceauth 1.0.6
|
|
||||||
- xhost 1.0.6
|
|
||||||
- xrandr 1.4.2
|
|
||||||
- xrefresh 1.0.5
|
|
||||||
- xset 1.2.3
|
|
||||||
|
|
||||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Sep 16 2013 Peter Hutterer <peter.hutterer@redhat.com> 7.7-4
|
|
||||||
- xinput 1.6.1
|
|
||||||
|
|
||||||
* Mon Sep 09 2013 Peter Hutterer <peter.hutterer@redhat.com> 7.7-3
|
|
||||||
- xmodmap 1.0.8
|
|
||||||
- xkill 1.0.4
|
|
||||||
- xrdb 1.1.0
|
|
||||||
|
|
||||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.7-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Mar 27 2013 Adam Jackson <ajax@redhat.com> 7.7-1
|
|
||||||
- rgb 1.0.5
|
|
||||||
- xsessreg 1.0.8
|
|
||||||
- xgamma 1.0.5
|
|
||||||
- xhost 1.0.5
|
|
||||||
- xmodmap 1.0.7
|
|
||||||
- xsetroot 1.1.1
|
|
||||||
- xstdcmap 1.0.3
|
|
||||||
|
|
||||||
* Thu Mar 07 2013 Dave Airlie <airlied@redhat.com> 7.5-17
|
|
||||||
- autoconf for aarch64
|
|
||||||
|
|
||||||
* Wed Feb 13 2013 Benjamin Tissoires <benjamin.tissoires@redhat.com> 7.5-16
|
|
||||||
- xrandr 1.4.0
|
|
||||||
|
|
||||||
* Wed Jan 30 2013 Adam Jackson <ajax@redhat.com> 7.5-15
|
|
||||||
- Print primary output in xrandr
|
|
||||||
|
|
||||||
* Wed Nov 14 2012 Adam Jackson <ajax@redhat.com> 7.5-14
|
|
||||||
- xinput 1.6.0
|
|
||||||
|
|
||||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.5-13
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Apr 17 2012 Peter Hutterer <peter.hutterer@redhat.com> 7.5-12
|
|
||||||
- Add libXinerama-devel requires for new xinput
|
|
||||||
|
|
||||||
* Tue Apr 17 2012 Peter Hutterer <peter.hutterer@redhat.com> 7.5-11
|
|
||||||
- xinput 1.5.99.901
|
|
||||||
|
|
||||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.5-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Dec 22 2011 Peter Hutterer <peter.hutterer@redhat.com> 7.5-9
|
|
||||||
- xinput 1.5.4
|
|
||||||
|
|
||||||
* Thu Nov 10 2011 Adam Jackson <ajax@redhat.com> 7.5-8
|
|
||||||
- Move xinput and xkill here from xorg-x11-apps
|
|
||||||
|
|
||||||
* Mon Oct 10 2011 Matěj Cepl <mcepl@redhat.com> - 7.5-7
|
|
||||||
- Fix BuildRequires ... xbitmaps-devel does not exist anymore (RHBZ #744751)
|
|
||||||
- Upgrade to the latest upstream iceauth, rgb, sessreg, and xrandr
|
|
||||||
Loading…
Reference in New Issue
Block a user