diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0d15766 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +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.6.tar.bz2 +SOURCES/xhost-1.0.7.tar.bz2 +SOURCES/xinput-1.6.2.tar.bz2 +SOURCES/xkill-1.0.4.tar.bz2 +SOURCES/xmodmap-1.0.9.tar.bz2 +SOURCES/xrandr-1.5.0.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 +SOURCES/xstdcmap-1.0.3.tar.bz2 diff --git a/.xorg-x11-server-utils.metadata b/.xorg-x11-server-utils.metadata new file mode 100644 index 0000000..d0b33ff --- /dev/null +++ b/.xorg-x11-server-utils.metadata @@ -0,0 +1,16 @@ +83d67e47167de52192c679a0f0a41f4ba51a5b94 SOURCES/iceauth-1.0.7.tar.bz2 +542fade81a74f8a6beaea8cb517bdf1033fc6b71 SOURCES/rgb-1.0.6.tar.bz2 +a27a476f7f39ae30a16dfa25ca07c12378cff7f0 SOURCES/sessreg-1.1.0.tar.bz2 +af1484d0d70bc71dc9d3b7b95645881b7165c41b SOURCES/xgamma-1.0.6.tar.bz2 +8abfb0554e14a074f0dbfdda4919880e088545cb SOURCES/xhost-1.0.7.tar.bz2 +68367ae6cb4753eeb5fd209afe033d7c4a817748 SOURCES/xinput-1.6.2.tar.bz2 +3a9c253ed698ae2e6c176a6f4a5a7d43497818f6 SOURCES/xkill-1.0.4.tar.bz2 +fe735c8bbba68d7eb50f82d4e092fdcadf161314 SOURCES/xmodmap-1.0.9.tar.bz2 +f402b2ed85817c2e111afafd6f5d0657328be2fa SOURCES/xrandr-1.5.0.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 +b7fcc50ae6100d2ba91d6847969fd9d2b6784a90 SOURCES/xstdcmap-1.0.3.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/SPECS/xorg-x11-server-utils.spec b/SPECS/xorg-x11-server-utils.spec new file mode 100644 index 0000000..137c9ea --- /dev/null +++ b/SPECS/xorg-x11-server-utils.spec @@ -0,0 +1,268 @@ +# doesn't work yet, needs more nickle bindings +%define with_xkeystone 0 + +# Component versions +%define iceauth 1.0.7 +%define rgb 1.0.6 +%define sessreg 1.1.0 +%define xgamma 1.0.6 +%define xhost 1.0.7 +%define xinput 1.6.2 +%define xkill 1.0.4 +%define xmodmap 1.0.9 +%define xrandr 1.5.0 +%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: 20%{?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) >= 1.5.0 +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. + +%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 -a11 -a12 -a13 -a14 -a15 + +pushd xrdb-* +%patch2 -p1 -b .nocpp +popd + +%build + +# Build all apps +{ + for app in * ; do + pushd $app + autoreconf -vif + %configure + make %{?_smp_mflags} + popd + done +} + +%install +# Install all apps +{ + for app in * ; do + pushd $app + case $app in + *) + %make_install + ;; + esac + popd + done +} +%if !%{with_xkeystone} +rm -f $RPM_BUILD_ROOT%{_bindir}/xkeystone +%endif + +%files +%doc +%{_bindir}/iceauth +%{_bindir}/sessreg +%{_bindir}/showrgb +%{_bindir}/xgamma +%{_bindir}/xhost +%{_bindir}/xinput +%{_bindir}/xkill +%{_bindir}/xmodmap +%{_bindir}/xrandr +%{_bindir}/xrdb +%{_bindir}/xrefresh +%{_bindir}/xset +%{_bindir}/xsetmode +%{_bindir}/xsetpointer +%{_bindir}/xsetroot +%{_bindir}/xstdcmap +%{_datadir}/X11/rgb.txt +%{_mandir}/man1/iceauth.1* +%{_mandir}/man1/sessreg.1* +%{_mandir}/man1/showrgb.1* +%{_mandir}/man1/xgamma.1* +%{_mandir}/man1/xhost.1* +%{_mandir}/man1/xinput.1* +%{_mandir}/man1/xkill.1* +%{_mandir}/man1/xmodmap.1* +%{_mandir}/man1/xrandr.1* +%{_mandir}/man1/xrdb.1* +%{_mandir}/man1/xrefresh.1* +%{_mandir}/man1/xset.1* +%{_mandir}/man1/xsetmode.1* +%{_mandir}/man1/xsetpointer.1* +%{_mandir}/man1/xsetroot.1* +%{_mandir}/man1/xstdcmap.1* + +%if %{with_xkeystone} +%files -n xkeystone +%{_bindir}/xkeystone +%endif + +%changelog +* Wed Feb 01 2017 Adam Jackson - 7.7-20 +- Sync with Fedora 25: xgamma 1.0.6, xhost 1.0.7, xinput 1.6.2, xmodmap 1.0.9, + xrandr 1.5.0 + +* 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 + +* 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 + +* 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 +- 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 7.5-17 +- autoconf for aarch64 + +* Wed Feb 13 2013 Benjamin Tissoires 7.5-16 +- xrandr 1.4.0 + +* Wed Jan 30 2013 Adam Jackson 7.5-15 +- Print primary output in xrandr + +* Wed Nov 14 2012 Adam Jackson 7.5-14 +- xinput 1.6.0 + +* Sun Jul 22 2012 Fedora Release Engineering - 7.5-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Apr 17 2012 Peter Hutterer 7.5-12 +- Add libXinerama-devel requires for new xinput + +* Tue Apr 17 2012 Peter Hutterer 7.5-11 +- xinput 1.5.99.901 + +* Sat Jan 14 2012 Fedora Release Engineering - 7.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 22 2011 Peter Hutterer 7.5-9 +- xinput 1.5.4 + +* Thu Nov 10 2011 Adam Jackson 7.5-8 +- Move xinput and xkill here from xorg-x11-apps + +* Mon Oct 10 2011 Matěj Cepl - 7.5-7 +- Fix BuildRequires ... xbitmaps-devel does not exist anymore (RHBZ #744751) +- Upgrade to the latest upstream iceauth, rgb, sessreg, and xrandr