rpms/xorg-x11-server-utils/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-server-utils.spec, 1.13, 1.14 lbxproxy-1.0.1-datadir-AtomControl-fix.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 15 00:24:51 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7723/devel
Modified Files:
.cvsignore sources xorg-x11-server-utils.spec
Removed Files:
lbxproxy-1.0.1-datadir-AtomControl-fix.patch
Log Message:
auto-import xorg-x11-server-utils-1.0.1-2 on branch devel from xorg-x11-server-utils-1.0.1-2.src.rpm
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 31 Jan 2006 16:10:02 -0000 1.4
+++ .cvsignore 15 Apr 2006 00:24:48 -0000 1.5
@@ -1,10 +1,8 @@
iceauth-1.0.1.tar.bz2
-lbxproxy-1.0.1.tar.bz2
rgb-1.0.0.tar.bz2
sessreg-1.0.0.tar.bz2
xcmsdb-1.0.1.tar.bz2
xgamma-1.0.1.tar.bz2
-xhost-1.0.0.tar.bz2
xmodmap-1.0.0.tar.bz2
xrandr-1.0.1.tar.bz2
xrdb-1.0.1.tar.bz2
@@ -16,3 +14,4 @@
xstdcmap-1.0.1.tar.bz2
xtrap-1.0.1.tar.bz2
xvidtune-1.0.1.tar.bz2
+xhost-1.0.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 31 Jan 2006 16:10:02 -0000 1.4
+++ sources 15 Apr 2006 00:24:48 -0000 1.5
@@ -1,10 +1,8 @@
50df9a5718b3cb6544a1c9f38b392b09 iceauth-1.0.1.tar.bz2
-9d5045a5c76b1fe360221b967a5aa0e9 lbxproxy-1.0.1.tar.bz2
04349739e0ce2a8557d32ffc55cb8d69 rgb-1.0.0.tar.bz2
15c8032bbf5197e8fb5d071d9500a880 sessreg-1.0.0.tar.bz2
8579d5f50ba7f0c4a5bf16b9670fea01 xcmsdb-1.0.1.tar.bz2
45d8fa3c85d4bfda87251798fd605a45 xgamma-1.0.1.tar.bz2
-426abcd1b36236a9dbe56770f57fcdfb xhost-1.0.0.tar.bz2
6c45ef77c26dce98e625d1f99df16468 xmodmap-1.0.0.tar.bz2
14de596b7276c46b77e336cbb4f13c24 xrandr-1.0.1.tar.bz2
9ed059ee45780d32c697d4acc6b07192 xrdb-1.0.1.tar.bz2
@@ -16,3 +14,4 @@
86ab558441edfb86f853639e4290a754 xstdcmap-1.0.1.tar.bz2
e49c695a0af17bc4896e51c298304643 xtrap-1.0.1.tar.bz2
e0744594f4e5969b20df28d897781318 xvidtune-1.0.1.tar.bz2
+5300c9aafa58878c8f6e85379d5c199c xhost-1.0.1.tar.bz2
Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-server-utils.spec 1 Mar 2006 06:37:01 -0000 1.13
+++ xorg-x11-server-utils.spec 15 Apr 2006 00:24:48 -0000 1.14
@@ -3,18 +3,17 @@
Summary: X.Org X11 X server utilities
Name: xorg-x11-%{pkgname}
Version: 1.0.1
-Release: 1.2
+Release: 2
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/iceauth-1.0.1.tar.bz2
-Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/lbxproxy-1.0.1.tar.bz2
Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rgb-1.0.0.tar.bz2
Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/sessreg-1.0.0.tar.bz2
Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcmsdb-1.0.1.tar.bz2
Source5: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xgamma-1.0.1.tar.bz2
-Source6: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xhost-1.0.0.tar.bz2
+Source6: http://xorg.freedesktop.org/releases/individual/app/xhost-1.0.1.tar.bz2
Source7: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmodmap-1.0.0.tar.bz2
Source8: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrandr-1.0.1.tar.bz2
Source9: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrdb-1.0.1.tar.bz2
@@ -35,9 +34,6 @@
# iceauth section
#Patch0:
-# lbxproxy section
-Patch1000: lbxproxy-1.0.1-datadir-AtomControl-fix.patch
-
# rgb section
Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
# xvidtune section
@@ -61,11 +57,11 @@
# xrdb requires the C preprocessor to work properly
Requires: cpp
-Provides: iceauth lbxproxy rgb sessreg xcmsdb xgamma xhost
+Provides: iceauth rgb sessreg xcmsdb xgamma xhost
Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
Provides: xsetroot xstdcmap xtrap xvidtune
-# NOTE: iceauth, lbxproxy, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap,
+# NOTE: iceauth, rgb, sessreg, xcmsdb, xgamma, xhost, xmodmap,
# xrandr, xrdb, xrefresh, xset, xsetmode, xsetpointer, xsetroot, xstdcmap,
# xtrap, xvidtune, were all in xorg-x11 and XFree86 packages, so we obsolete
# them to ensure upgrades work.
@@ -76,8 +72,7 @@
of the X server.
%prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
-%patch1000 -p0 -b .datadir-AtomControl-fix
+%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
%patch1100 -p0 -b .datadir-rgbpath-fix
@@ -92,12 +87,6 @@
echo "******************** $app"
case $app in
- lbxproxy-*)
- aclocal --force
- automake -f
- autoconf
- %configure ;#configdir=%{_datadir}/X11/lbxproxy
- ;;
rgb-*)
# FIXME: run autotools junk to kick in our patch
aclocal --force
@@ -129,9 +118,6 @@
for app in * ; do
pushd $app
case $app in
- lbxproxy-*)
- make install DESTDIR=$RPM_BUILD_ROOT
- ;;
*)
make install DESTDIR=$RPM_BUILD_ROOT
;;
@@ -147,7 +133,6 @@
%defattr(-,root,root,-)
%doc
%{_bindir}/iceauth
-%{_bindir}/lbxproxy
%{_bindir}/sessreg
%{_bindir}/showrgb
%{_bindir}/xcmsdb
@@ -174,11 +159,8 @@
%{_datadir}/X11/rgb.txt
%dir %{_datadir}/X11/app-defaults
%{_datadir}/X11/app-defaults/Xvidtune
-%dir %{_datadir}/X11/lbxproxy
-%{_datadir}/X11/lbxproxy/AtomControl
#%dir %{_mandir}/man1x
%{_mandir}/man1/iceauth.1x*
-%{_mandir}/man1/lbxproxy.1x*
%{_mandir}/man1/sessreg.1x*
%{_mandir}/man1/showrgb.1x*
%{_mandir}/man1/xcmsdb.1x*
@@ -204,6 +186,10 @@
%{_mandir}/man1/xvidtune.1x*
%changelog
+* Fri Apr 14 2006 Adam Jackson <ajackson at redhat.com> 1.0.1-2
+- Drop lbxproxy, LBX is deprecated upstream
+- Update to xhost 1.0.1
+
* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> 1.0.1-1.2
- bump again for double-long bug on ppc(64)
--- lbxproxy-1.0.1-datadir-AtomControl-fix.patch DELETED ---
More information about the fedora-cvs-commits
mailing list