From b8198fa45ebda0242526906f5f1469e65678c35e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:47:55 +0000 Subject: import xorg-x11-server-utils-7.7-14.el7 --- diff --git a/.gitignore b/.gitignore index c6ae39c..510c2a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ -SOURCES/iceauth-1.0.5.tar.bz2 -SOURCES/rgb-1.0.5.tar.bz2 -SOURCES/sessreg-1.0.8.tar.bz2 +SOURCES/iceauth-1.0.7.tar.bz2 +SOURCES/rgb-1.0.6.tar.bz2 +SOURCES/sessreg-1.1.0.tar.bz2 SOURCES/xgamma-1.0.5.tar.bz2 -SOURCES/xhost-1.0.5.tar.bz2 -SOURCES/xinput-1.6.0.tar.bz2 -SOURCES/xkill-1.0.3.tar.bz2 -SOURCES/xmodmap-1.0.7.tar.bz2 -SOURCES/xrandr-1.4.0.tar.bz2 -SOURCES/xrdb-1.0.9.tar.bz2 -SOURCES/xrefresh-1.0.4.tar.bz2 -SOURCES/xset-1.2.2.tar.bz2 +SOURCES/xhost-1.0.6.tar.bz2 +SOURCES/xinput-1.6.1.tar.bz2 +SOURCES/xkill-1.0.4.tar.bz2 +SOURCES/xmodmap-1.0.8.tar.bz2 +SOURCES/xrandr-1.4.3.tar.bz2 +SOURCES/xrdb-1.1.0.tar.bz2 +SOURCES/xrefresh-1.0.5.tar.bz2 +SOURCES/xset-1.2.3.tar.bz2 SOURCES/xsetmode-1.0.0.tar.bz2 SOURCES/xsetpointer-1.0.1.tar.bz2 SOURCES/xsetroot-1.1.1.tar.bz2 diff --git a/.xorg-x11-server-utils.metadata b/.xorg-x11-server-utils.metadata index f1d910a..bda914f 100644 --- a/.xorg-x11-server-utils.metadata +++ b/.xorg-x11-server-utils.metadata @@ -1,15 +1,15 @@ -d996c6ecaa93dcaccee4a11991eeacd40bddc13e SOURCES/iceauth-1.0.5.tar.bz2 -c3e62229ca6ee8f4ca96d6f4997fe3e4381f3cc7 SOURCES/rgb-1.0.5.tar.bz2 -dc4fa8b804e7cb4cfbadbef3708c3b97076ddb65 SOURCES/sessreg-1.0.8.tar.bz2 +83d67e47167de52192c679a0f0a41f4ba51a5b94 SOURCES/iceauth-1.0.7.tar.bz2 +542fade81a74f8a6beaea8cb517bdf1033fc6b71 SOURCES/rgb-1.0.6.tar.bz2 +a27a476f7f39ae30a16dfa25ca07c12378cff7f0 SOURCES/sessreg-1.1.0.tar.bz2 9cd3272fd24f51b75223cf9c59949ded6df04800 SOURCES/xgamma-1.0.5.tar.bz2 -c9ad0447c709fc7a9a2afbbca712cf47fbb29757 SOURCES/xhost-1.0.5.tar.bz2 -958b77a2acf52197b9a1e3e3d11e9bc57fbb1e6c SOURCES/xinput-1.6.0.tar.bz2 -bab7b9c7f3bc053d743eb339cf5fa496bace57e5 SOURCES/xkill-1.0.3.tar.bz2 -9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef SOURCES/xmodmap-1.0.7.tar.bz2 -01bdbe3905e19fad93fe9fcb6185f16d22ad33b2 SOURCES/xrandr-1.4.0.tar.bz2 -efa5f2420411988d6a6e142934393fd272507857 SOURCES/xrdb-1.0.9.tar.bz2 -5e85ee14ea9a357c1d4372bbc068a8d452a134aa SOURCES/xrefresh-1.0.4.tar.bz2 -e48d628259dbe1ff413ec8408b4fee9561c8815c SOURCES/xset-1.2.2.tar.bz2 +6224c8bcd909bf205c7e92dbdc349356890c4428 SOURCES/xhost-1.0.6.tar.bz2 +859d98b428c4b343f40fd93dd6c63bec1f546ae4 SOURCES/xinput-1.6.1.tar.bz2 +3a9c253ed698ae2e6c176a6f4a5a7d43497818f6 SOURCES/xkill-1.0.4.tar.bz2 +44ebb0a1047fc9391422108007c30c64cc0782bc SOURCES/xmodmap-1.0.8.tar.bz2 +30fde46b9ed9f3fa8a9c05837723306299f62a37 SOURCES/xrandr-1.4.3.tar.bz2 +b95ae53b767ee7b56baa55fc78eb9c0b9e5ccd29 SOURCES/xrdb-1.1.0.tar.bz2 +f0372afb62f75ad29343abc96dbf80be12050b72 SOURCES/xrefresh-1.0.5.tar.bz2 +62a5e7ec91e6900b798a88ca3b30d25bd5ef3047 SOURCES/xset-1.2.3.tar.bz2 add4e6a91c9d0e7d1a80b3534c64d6b7bf633ea0 SOURCES/xsetmode-1.0.0.tar.bz2 a8b01c6f27625a6f6943f9be17b1e5511f69d710 SOURCES/xsetpointer-1.0.1.tar.bz2 63bfcf55e95553df1e28f538bf009883568115d1 SOURCES/xsetroot-1.1.1.tar.bz2 diff --git a/SOURCES/0001-Default-to-nocpp-add-cpp-default.patch b/SOURCES/0001-Default-to-nocpp-add-cpp-default.patch new file mode 100644 index 0000000..db7f17c --- /dev/null +++ b/SOURCES/0001-Default-to-nocpp-add-cpp-default.patch @@ -0,0 +1,74 @@ +From aeabf7344efeb20f515e804d3acc830730d9433b Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Tue, 21 Jul 2015 09:45:27 -0400 +Subject: [PATCH] Default to -nocpp, add -cpp default + +Signed-off-by: Adam Jackson +Signed-off-by: Olivier Fourdan +--- + xrdb.c | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/xrdb.c b/xrdb.c +index 24a6aa5..599edb7 100644 +--- a/xrdb.c ++++ b/xrdb.c +@@ -746,8 +746,8 @@ Syntax (void) + " -screen do screen-specific resources for one screen\n" + " -screens do screen-specific resources for all screens\n" + " -n show but don't do changes\n" +- " -cpp filename preprocessor to use [%s]\n" +- " -nocpp do not use a preprocessor\n" ++ " -cpp filename preprocessor to use [%s if \"default\" given]\n" ++ " -nocpp do not use a preprocessor [default]\n" + " -query query resources\n" + " -load load resources from file [default]\n" + " -override add in resources from file\n" +@@ -761,7 +761,7 @@ Syntax (void) + " -Dname[=value], -Uname, -Idirectory passed to preprocessor\n" + "\n" + "A - or no input filename represents stdin.\n", +- ProgramName, cpp_program ? cpp_program : "", BACKUP_SUFFIX); ++ ProgramName, cpp_program ? cpp_program : "none", BACKUP_SUFFIX); + exit (1); + } + +@@ -855,6 +855,7 @@ main(int argc, char *argv[]) + int retainProp = 0; + FILE *fp = NULL; + Bool need_newline; ++ char *cpp = NULL; + + ProgramName = argv[0]; + +@@ -913,13 +914,16 @@ main(int argc, char *argv[]) + continue; + } else if (isabbreviation ("-cpp", arg, 2)) { + if (++i >= argc) Syntax (); +- cpp_program = argv[i]; ++ if (!strcmp(argv[i], "default")) ++ cpp = cpp_program; ++ else ++ cpp = argv[i]; + continue; + } else if (!strcmp ("-n", arg)) { + dont_execute = True; + continue; + } else if (isabbreviation ("-nocpp", arg, 3)) { +- cpp_program = NULL; ++ cpp = NULL; + continue; + } else if (isabbreviation ("-query", arg, 2)) { + oper = OPQUERY; +@@ -991,6 +995,8 @@ main(int argc, char *argv[]) + else + filename = arg; + } /* end for */ ++ ++ cpp_program = cpp; + + #ifndef WIN32 + while ((i = open("/dev/null", O_RDONLY)) < 3) +-- +2.4.3 + diff --git a/SOURCES/0001-Default-to-nocpp.patch b/SOURCES/0001-Default-to-nocpp.patch deleted file mode 100644 index 6ad3be6..0000000 --- a/SOURCES/0001-Default-to-nocpp.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up xrdb-1.0.9/xrdb.c.nocpp xrdb-1.0.9/xrdb.c ---- xrdb-1.0.9/xrdb.c.nocpp 2011-04-05 12:01:15.000000000 -0400 -+++ xrdb-1.0.9/xrdb.c 2013-10-02 10:48:30.774355639 -0400 -@@ -845,23 +845,6 @@ main(int argc, char *argv[]) - /* initialize the includes String struct */ - addstring(&includes, ""); - -- /* Pick the default cpp to use. This needs to be done before -- * we parse the command line in order to honor -nocpp which sets -- * it back to NULL. -- */ -- if (cpp_program == NULL) { -- int number_of_elements -- = (sizeof cpp_locations) / (sizeof cpp_locations[0]); -- int j; -- -- for (j = 0; j < number_of_elements; j++) { -- if (access(cpp_locations[j], X_OK) == 0) { -- cpp_program = cpp_locations[j]; -- break; -- } -- } -- } -- - /* needs to be replaced with XrmParseCommand */ - - for (i = 1; i < argc; i++) { -@@ -956,6 +939,27 @@ main(int argc, char *argv[]) - filename = arg; - } /* end for */ - -+ if (cpp_program != NULL) { -+ int number_of_elements -+ = (sizeof cpp_locations) / (sizeof cpp_locations[0]); -+ int j; -+ -+ for (j = 0; j < number_of_elements; j++) { -+ char *end, *dup; -+ /* cut off arguments */ -+ dup = strdup(cpp_locations[j]); -+ end = strchr(dup,' '); -+ if (end) -+ *end = '\0'; -+ if (access(dup, X_OK) == 0) { -+ cpp_program = cpp_locations[j]; -+ free(dup); -+ break; -+ } -+ free(dup); -+ } -+ } -+ - #ifndef WIN32 - while ((i = open("/dev/null", O_RDONLY)) < 3) - ; /* make sure later freopen won't clobber things */ diff --git a/SOURCES/xmodmap-1.0.7-fix-configh.patch b/SOURCES/xmodmap-1.0.7-fix-configh.patch deleted file mode 100644 index 79f13fb..0000000 --- a/SOURCES/xmodmap-1.0.7-fix-configh.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Mon, 23 Apr 2012 14:28:39 +0000 -Subject: include config.h before stdio.h & other system headers - -Ensures definitions like _GNU_SOURCE are visible when needed. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Peter Hutterer ---- -diff --git a/exec.c b/exec.c -index dbcb669..419b10e 100644 ---- a/exec.c -+++ b/exec.c -@@ -54,6 +54,10 @@ from The Open Group. - * original xmodmap, written by David Rosenthal, of Sun Microsystems. - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include - #include - #include -diff --git a/pf.c b/pf.c -index 0eb0f55..3f0c3f4 100644 ---- a/pf.c -+++ b/pf.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include - #include - #include -diff --git a/xmodmap.c b/xmodmap.c -index 58a8e70..0f89629 100644 ---- a/xmodmap.c -+++ b/xmodmap.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include - #include - #include --- -cgit v0.9.0.2-2-gbebe diff --git a/SPECS/xorg-x11-server-utils.spec b/SPECS/xorg-x11-server-utils.spec index 7cb43a5..005510d 100644 --- a/SPECS/xorg-x11-server-utils.spec +++ b/SPECS/xorg-x11-server-utils.spec @@ -1,78 +1,100 @@ -%define pkgname server-utils # doesn't work yet, needs more nickle bindings %define with_xkeystone 0 -Summary: X.Org X11 X server utilities -Name: xorg-x11-%{pkgname} -Version: 7.7 -Release: 4%{?dist} -License: MIT -Group: User Interface/X -URL: http://www.x.org - -Source0: http://www.x.org/pub/individual/app/iceauth-1.0.5.tar.bz2 -Source2: http://www.x.org/pub/individual/app/rgb-1.0.5.tar.bz2 -Source3: http://www.x.org/pub/individual/app/sessreg-1.0.8.tar.bz2 -Source5: http://www.x.org/pub/individual/app/xgamma-1.0.5.tar.bz2 -Source6: http://www.x.org/pub/individual/app/xhost-1.0.5.tar.bz2 -Source7: http://www.x.org/pub/individual/app/xmodmap-1.0.7.tar.bz2 -Source8: http://www.x.org/pub/individual/app/xrandr-1.4.0.tar.bz2 -Source9: http://www.x.org/pub/individual/app/xrdb-1.0.9.tar.bz2 -Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.4.tar.bz2 -Source11: http://www.x.org/pub/individual/app/xset-1.2.2.tar.bz2 -Source12: http://www.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2 -Source13: http://www.x.org/pub/individual/app/xsetpointer-1.0.1.tar.bz2 -Source14: http://www.x.org/pub/individual/app/xsetroot-1.1.1.tar.bz2 -Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.3.tar.bz2 -Source16: http://www.x.org/pub/individual/app/xkill-1.0.3.tar.bz2 -Source17: http://www.x.org/pub/individual/app/xinput-1.6.0.tar.bz2 - -Patch1: xmodmap-1.0.7-fix-configh.patch -Patch2: 0001-Default-to-nocpp.patch - -BuildRequires: xorg-x11-util-macros - -BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr) -BuildRequires: pkgconfig(xxf86vm) pkgconfig(xrender) pkgconfig(xi) -BuildRequires: pkgconfig(xt) pkgconfig(xpm) pkgconfig(xxf86misc) -BuildRequires: pkgconfig(xtrans) -# xsetroot requires xbitmaps-devel (which was renamed now) -BuildRequires: xorg-x11-xbitmaps -# xsetroot -BuildRequires: libXcursor-devel -# xinput -BuildRequires: libXinerama-devel - -BuildRequires: autoconf automake libtool - -# older -apps had xinput and xkill, moved them here because they're -# a) universally useful and b) don't require Xaw -Conflicts: xorg-x11-apps < 7.6-4 - -Provides: iceauth rgb sessreg xgamma xhost -Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer -Provides: xsetroot xstdcmap xinput xkill +# Component versions +%define iceauth 1.0.7 +%define rgb 1.0.6 +%define sessreg 1.1.0 +%define xgamma 1.0.5 +%define xhost 1.0.6 +%define xinput 1.6.1 +%define xkill 1.0.4 +%define xmodmap 1.0.8 +%define xrandr 1.4.3 +%define xrdb 1.1.0 +%define xrefresh 1.0.5 +%define xset 1.2.3 +%define xsetmode 1.0.0 +%define xsetpointer 1.0.1 +%define xsetroot 1.1.1 +%define xstdcmap 1.0.3 + +Summary: X.Org X11 X server utilities +Name: xorg-x11-server-utils +Version: 7.7 +Release: 14%{?dist} +License: MIT +URL: http://www.x.org + +Source0: http://www.x.org/pub/individual/app/iceauth-%{iceauth}.tar.bz2 +Source1: http://www.x.org/pub/individual/app/rgb-%{rgb}.tar.bz2 +Source2: http://www.x.org/pub/individual/app/sessreg-%{sessreg}.tar.bz2 +Source3: http://www.x.org/pub/individual/app/xgamma-%{xgamma}.tar.bz2 +Source4: http://www.x.org/pub/individual/app/xhost-%{xhost}.tar.bz2 +Source5: http://www.x.org/pub/individual/app/xinput-%{xinput}.tar.bz2 +Source6: http://www.x.org/pub/individual/app/xkill-%{xkill}.tar.bz2 +Source7: http://www.x.org/pub/individual/app/xmodmap-%{xmodmap}.tar.bz2 +Source8: http://www.x.org/pub/individual/app/xrandr-%{xrandr}.tar.bz2 +Source9: http://www.x.org/pub/individual/app/xrdb-%{xrdb}.tar.bz2 +Source10: http://www.x.org/pub/individual/app/xrefresh-%{xrefresh}.tar.bz2 +Source11: http://www.x.org/pub/individual/app/xset-%{xset}.tar.bz2 +Source12: http://www.x.org/pub/individual/app/xsetmode-%{xsetmode}.tar.bz2 +Source13: http://www.x.org/pub/individual/app/xsetpointer-%{xsetpointer}.tar.bz2 +Source14: http://www.x.org/pub/individual/app/xsetroot-%{xsetroot}.tar.bz2 +Source15: http://www.x.org/pub/individual/app/xstdcmap-%{xstdcmap}.tar.bz2 + +Patch2: 0001-Default-to-nocpp-add-cpp-default.patch + +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(xxf86misc) +BuildRequires: pkgconfig(xxf86vm) + +BuildRequires: libtool + +Provides: iceauth = %{iceauth} +Provides: rgb = %{rgb} +Provides: sessreg = %{sessreg} +Provides: xgamma = %{xgamma} +Provides: xhost = %{xhost} +Provides: xinput = %{xinput} +Provides: xkill = %{xkill} +Provides: xmodmap = %{xmodmap} +Provides: xrandr = %{xrandr} +Provides: xrdb = %{xrdb} +Provides: xrefresh = %{xrefresh} +Provides: xset = %{xset} +Provides: xsetmode = %{xsetmode} +Provides: xsetpointer = %{xsetpointer} +Provides: xsetroot = %{xsetroot} +Provides: xstdcmap = %{xstdcmap} %description -A collection of utilities used to tweak and query the runtime configuration -of the X server. +A collection of utilities used to tweak and query the runtime configuration of +the X server. %if %{with_xkeystone} %package -n xkeystone -Summary: X display keystone correction -Group: User Interface/X -Requires: nickle +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} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 - -pushd xmodmap-* -%patch1 -p1 -b .configh -popd +%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 pushd xrdb-* %patch2 -p1 -b .nocpp @@ -84,49 +106,31 @@ popd { for app in * ; do pushd $app - case $app in - rgb-*) - autoreconf -vif - %configure ;# --with-rgb-db=%{_datadir}/X11 - ;; - xset-*) - autoreconf -vif - %configure - ;; - *) - autoreconf -vif - %configure - ;; - esac - - make + autoreconf -vif + %configure + make %{?_smp_mflags} popd done } %install -rm -rf $RPM_BUILD_ROOT # Install all apps { for app in * ; do pushd $app case $app in *) - make install DESTDIR=$RPM_BUILD_ROOT + %make_install ;; esac popd done } %if !%{with_xkeystone} -rm -f $RPM_BUILD_ROOT/usr/bin/xkeystone +rm -f $RPM_BUILD_ROOT%{_bindir}/xkeystone %endif -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %doc %{_bindir}/iceauth %{_bindir}/sessreg @@ -164,20 +168,57 @@ rm -rf $RPM_BUILD_ROOT %if %{with_xkeystone} %files -n xkeystone -%defattr(-,root,root,-) %{_bindir}/xkeystone %endif %changelog -* Thu Feb 13 2014 Adam Jackson 7.7-4 +* Mon Sep 07 2015 Olivier Fourdan 7.7-14 +- Fix regression introduced by the nocpp patch if no cpp is installed. + +* Tue Jul 21 2015 Adam Jackson 7.7-13 +- Merge F22, rebase nocpp patch + +* Tue Jan 20 2015 Simone Caronni - 7.7-12 +- Update sessreg to 1.1.0. + +* Sat Jan 17 2015 Simone Caronni - 7.7-11 +- Update iceauth to 1.0.7. + +* Mon Nov 10 2014 Simone Caronni - 7.7-10 +- rgb 1.0.6 + +* Thu Oct 23 2014 Simone Caronni - 7.7-9 +- Clean up SPEC file, fix rpmlint warnings. + +* Wed Oct 01 2014 Adam Jackson 7.7-8 +- xrandr 1.4.3 + +* Mon Aug 18 2014 Fedora Release Engineering - 7.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jun 12 2014 Simone Caronni 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 - 7.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Feb 13 2014 Adam Jackson 7.7-4.el7 - Fix configure to not point to mcpp either -* Fri Dec 27 2013 Daniel Mach - 7.7-3 -- Mass rebuild 2013-12-27 +* Mon Sep 16 2013 Peter Hutterer 7.7-4 +- xinput 1.6.1 + +* Mon Sep 09 2013 Peter Hutterer 7.7-3 +- xmodmap 1.0.8 +- xkill 1.0.4 +- xrdb 1.1.0 -* Wed Oct 02 2013 Adam Jackson 7.7-2 -- xrdb: Default to -nocpp -- Drop Requires: mcpp to match; install cpp if you need it. +* Sun Aug 04 2013 Fedora Release Engineering - 7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Wed Mar 27 2013 Adam Jackson 7.7-1 - rgb 1.0.5