diff --git a/.xorg-x11-server-utils.metadata b/.xorg-x11-server-utils.metadata new file mode 100644 index 0000000..36c309b --- /dev/null +++ b/.xorg-x11-server-utils.metadata @@ -0,0 +1,16 @@ +c3e62229ca6ee8f4ca96d6f4997fe3e4381f3cc7 SOURCES/rgb-1.0.5.tar.bz2 +9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef SOURCES/xmodmap-1.0.7.tar.bz2 +b7fcc50ae6100d2ba91d6847969fd9d2b6784a90 SOURCES/xstdcmap-1.0.3.tar.bz2 +01bdbe3905e19fad93fe9fcb6185f16d22ad33b2 SOURCES/xrandr-1.4.0.tar.bz2 +9cd3272fd24f51b75223cf9c59949ded6df04800 SOURCES/xgamma-1.0.5.tar.bz2 +add4e6a91c9d0e7d1a80b3534c64d6b7bf633ea0 SOURCES/xsetmode-1.0.0.tar.bz2 +e48d628259dbe1ff413ec8408b4fee9561c8815c SOURCES/xset-1.2.2.tar.bz2 +d996c6ecaa93dcaccee4a11991eeacd40bddc13e SOURCES/iceauth-1.0.5.tar.bz2 +efa5f2420411988d6a6e142934393fd272507857 SOURCES/xrdb-1.0.9.tar.bz2 +5e85ee14ea9a357c1d4372bbc068a8d452a134aa SOURCES/xrefresh-1.0.4.tar.bz2 +c9ad0447c709fc7a9a2afbbca712cf47fbb29757 SOURCES/xhost-1.0.5.tar.bz2 +dc4fa8b804e7cb4cfbadbef3708c3b97076ddb65 SOURCES/sessreg-1.0.8.tar.bz2 +bab7b9c7f3bc053d743eb339cf5fa496bace57e5 SOURCES/xkill-1.0.3.tar.bz2 +958b77a2acf52197b9a1e3e3d11e9bc57fbb1e6c SOURCES/xinput-1.6.0.tar.bz2 +63bfcf55e95553df1e28f538bf009883568115d1 SOURCES/xsetroot-1.1.1.tar.bz2 +a8b01c6f27625a6f6943f9be17b1e5511f69d710 SOURCES/xsetpointer-1.0.1.tar.bz2 diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Default-to-nocpp.patch b/SOURCES/0001-Default-to-nocpp.patch new file mode 100644 index 0000000..6ad3be6 --- /dev/null +++ b/SOURCES/0001-Default-to-nocpp.patch @@ -0,0 +1,55 @@ +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 new file mode 100644 index 0000000..79f13fb --- /dev/null +++ b/SOURCES/xmodmap-1.0.7-fix-configh.patch @@ -0,0 +1,57 @@ +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 new file mode 100644 index 0000000..4265200 --- /dev/null +++ b/SPECS/xorg-x11-server-utils.spec @@ -0,0 +1,217 @@ +%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: 2%{?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 + +%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 +Group: User Interface/X +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 + +pushd xrdb-* +%patch2 -p1 -b .nocpp +popd + +%build + +# Build all apps +{ + 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 --with-cpp=/usr/bin/mcpp + ;; + esac + + make + 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 + ;; + esac + popd + done +} +%if !%{with_xkeystone} +rm -f $RPM_BUILD_ROOT/usr/bin/xkeystone +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%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 +%defattr(-,root,root,-) +%{_bindir}/xkeystone +%endif + +%changelog +* Wed Oct 02 2013 Adam Jackson 7.7-2 +- xrdb: Default to -nocpp +- Drop Requires: mcpp to match; install cpp if you need it. + +* 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