rpms/xorg-x11-server-utils/devel import.log, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xorg-x11-server-utils.spec, 1.34, 1.35

Mon Jun 30 17:42:02 UTC 2008

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27823/devel

Modified Files:
	.cvsignore sources xorg-x11-server-utils.spec 
Added Files:
	import.log 
Log Message:
Drop xtrap utils.

--- NEW FILE import.log ---
xorg-x11-server-utils-7_4-1_fc10:HEAD:xorg-x11-server-utils-7.4-1.fc10.src.rpm:1214847653


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	24 Sep 2007 19:29:12 -0000	1.12
+++ .cvsignore	30 Jun 2008 17:41:10 -0000	1.13
@@ -1,17 +1,16 @@
 iceauth-1.0.2.tar.bz2
 rgb-1.0.1.tar.bz2
+sessreg-1.0.3.tar.bz2
 xcmsdb-1.0.1.tar.bz2
+xgamma-1.0.2.tar.bz2
 xhost-1.0.1.tar.bz2
+xmodmap-1.0.3.tar.bz2
 xrandr-1.2.2.tar.bz2
+xrdb-1.0.4.tar.bz2
 xrefresh-1.0.2.tar.bz2
+xset-1.0.3.tar.bz2
 xsetmode-1.0.0.tar.bz2
 xsetpointer-1.0.0.tar.bz2
+xsetroot-1.0.2.tar.bz2
 xstdcmap-1.0.1.tar.bz2
-xtrap-1.0.2.tar.bz2
 xvidtune-1.0.1.tar.bz2
-sessreg-1.0.3.tar.bz2
-xgamma-1.0.2.tar.bz2
-xmodmap-1.0.3.tar.bz2
-xrdb-1.0.4.tar.bz2
-xset-1.0.3.tar.bz2
-xsetroot-1.0.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	24 Sep 2007 19:29:12 -0000	1.12
+++ sources	30 Jun 2008 17:41:10 -0000	1.13
@@ -1,17 +1,16 @@
 7ab8b64edf0212a9d9a3c8129901a450  iceauth-1.0.2.tar.bz2
 255222b3ab3af671289a6b4844e9f393  rgb-1.0.1.tar.bz2
+07665816f2623ec82e665fb7d31c6cef  sessreg-1.0.3.tar.bz2
 8579d5f50ba7f0c4a5bf16b9670fea01  xcmsdb-1.0.1.tar.bz2
+f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
 5300c9aafa58878c8f6e85379d5c199c  xhost-1.0.1.tar.bz2
+626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
 c6ec9dc42396e3b3a2da932f3feca6ec  xrandr-1.2.2.tar.bz2
+34eb2311a0c5279e7b4f492e826f63d1  xrdb-1.0.4.tar.bz2
 1228f890f86148e4e6ae22aa73118cbb  xrefresh-1.0.2.tar.bz2
+657bbb43ce5470c33665d187c1740566  xset-1.0.3.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 c94ea103e27e370e4e5030e50c5d5d69  xsetpointer-1.0.0.tar.bz2
+9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
-97a62a011a11f03b46d72851aa298fa8  xtrap-1.0.2.tar.bz2
 e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
-07665816f2623ec82e665fb7d31c6cef  sessreg-1.0.3.tar.bz2
-f13ddedaa63a608d3b025d326f4f5b5d  xgamma-1.0.2.tar.bz2
-626731003ec22a74ecf9e44ed098bbdf  xmodmap-1.0.3.tar.bz2
-34eb2311a0c5279e7b4f492e826f63d1  xrdb-1.0.4.tar.bz2
-657bbb43ce5470c33665d187c1740566  xset-1.0.3.tar.bz2
-9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2


Index: xorg-x11-server-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-server-utils.spec	20 Feb 2008 08:06:31 -0000	1.34
+++ xorg-x11-server-utils.spec	30 Jun 2008 17:41:10 -0000	1.35
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
-Version: 7.3
-Release: 3%{?dist}
+Version: 7.4
+Release: 1%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -24,8 +24,7 @@
 Source13: ftp://ftp.x.org/pub/individual/app/xsetpointer-1.0.0.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/app/xsetroot-1.0.2.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xstdcmap-1.0.1.tar.bz2
-Source16: ftp://ftp.x.org/pub/individual/app/xtrap-1.0.2.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
+Source16: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.1.tar.bz2
 # NOTE: Each upstream tarball has its own "PatchN" section, taken from
 # multiplying the "SourceN" line times 100.  Please keep them in this
 # order.  Also, please keep each patch specific to a single upstream tarball,
@@ -57,8 +56,6 @@
 BuildRequires: libX11-devel
 # xsetroot requires libXmu-devel
 BuildRequires: libXmu-devel
-# xtrap requires libXTrap-devel
-BuildRequires: libXTrap-devel
 BuildRequires: xorg-x11-xtrans-devel libXext-devel
 BuildRequires: libXrandr-devel >= 1.2.0
 BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
@@ -77,11 +74,11 @@
 
 Provides: iceauth rgb sessreg xcmsdb xgamma xhost
 Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
-Provides: xsetroot xstdcmap xtrap xvidtune
+Provides: xsetroot xstdcmap xvidtune
 
 # 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
+# xvidtune, were all in xorg-x11 and XFree86 packages, so we obsolete
 # them to ensure upgrades work.
 Obsoletes: xorg-x11, XFree86
 
@@ -90,7 +87,7 @@
 of the X server.
 
 %prep
-%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
+%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
 
 %patch1100 -p0 -b .datadir-rgbpath-fix
 %patch1200 -p0 -b .xprint
@@ -174,13 +171,6 @@
 %{_bindir}/xsetpointer
 %{_bindir}/xsetroot
 %{_bindir}/xstdcmap
-%{_bindir}/xtrapchar
-%{_bindir}/xtrapin
-%{_bindir}/xtrapinfo
-%{_bindir}/xtrapout
-%{_bindir}/xtrapproto
-%{_bindir}/xtrapreset
-%{_bindir}/xtrapstats
 %{_bindir}/xvidtune
 %dir %{_datadir}/X11
 %{_datadir}/X11/rgb.txt
@@ -200,17 +190,12 @@
 %{_mandir}/man1/xsetpointer.1*
 %{_mandir}/man1/xsetroot.1*
 %{_mandir}/man1/xstdcmap.1*
-%{_mandir}/man1/xtrap.1*
-%{_mandir}/man1/xtrapchar.1*
-%{_mandir}/man1/xtrapin.1*
-%{_mandir}/man1/xtrapinfo.1*
-%{_mandir}/man1/xtrapout.1*
-%{_mandir}/man1/xtrapproto.1*
-%{_mandir}/man1/xtrapreset.1*
-%{_mandir}/man1/xtrapstats.1*
 %{_mandir}/man1/xvidtune.1*
 
 %changelog
+* Mon Jun 30 2008 Adam Jackson <ajax at redhat.com> 7.4-1
+- Drop xtrap utils, it's deprecated upstream.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.3-3
 - Autorebuild for GCC 4.3
 


