rpms/xorg-x11-server-utils/devel sources, 1.15, 1.16 xorg-x11-server-utils.spec, 1.43, 1.44 xvidtune-1.0.1-buffer-stomp.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

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

Modified Files:
	sources xorg-x11-server-utils.spec 
Removed Files:
	xvidtune-1.0.1-buffer-stomp.patch 
Log Message:
* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-8
- Drop xvidtune, move it to -apps to isolate libXaw deps



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server-utils/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	4 Feb 2009 21:50:49 -0000	1.15
+++ sources	2 Jul 2009 20:20:56 -0000	1.16
@@ -12,5 +12,4 @@ d074e79d380b031d2f60e4cd56538c93  xsetmo
 9e5bcbeda4aaf02bfa095e41d30baee4  xsetpointer-1.0.1.tar.bz2
 9af7db9f3052aef0b11636720b3101dd  xsetroot-1.0.2.tar.bz2
 86ab558441edfb86f853639e4290a754  xstdcmap-1.0.1.tar.bz2
-e0744594f4e5969b20df28d897781318  xvidtune-1.0.1.tar.bz2
 ea230049f757cd48fa46965c36ab552c  xrandr-1.2.99.4.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.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- xorg-x11-server-utils.spec	26 Feb 2009 11:33:01 -0000	1.43
+++ xorg-x11-server-utils.spec	2 Jul 2009 20:20:57 -0000	1.44
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -26,7 +26,6 @@ Source12: http://www.x.org/pub/individua
 Source13: http://www.x.org/pub/individual/app/xsetpointer-1.0.1.tar.bz2
 Source14: http://www.x.org/pub/individual/app/xsetroot-1.0.2.tar.bz2
 Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.1.tar.bz2
-Source16: http://www.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,
@@ -39,9 +38,6 @@ Source16: http://www.x.org/pub/individua
 Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch
 # xset section
 Patch1200: xset-1.0.2-spurious-xprint.patch
-# xvidtune section
-#Patch1700: xvidtune-0.99.1-datadir-app-defaults-fix.patch
-Patch1700: xvidtune-1.0.1-buffer-stomp.patch
 
 # FIXME: Temporary build dep on automake, autoconf while they're still used
 # in the specfile.
@@ -57,7 +53,7 @@ BuildRequires: libXmu-devel
 BuildRequires: xorg-x11-xtrans-devel libXext-devel
 BuildRequires: libXrandr-devel >= 1.2.0
 BuildRequires: xorg-x11-util-macros libXxf86vm-devel libXrandr-devel
-BuildRequires: libXrender-devel libXi-devel libXt-devel libXaw-devel
+BuildRequires: libXrender-devel libXi-devel libXt-devel
 BuildRequires: libXpm-devel libXxf86misc-devel
 BuildRequires: zlib-devel
 # ENDNOTE
@@ -72,7 +68,7 @@ Requires: libXrandr >= 1.2.0
 
 Provides: iceauth rgb sessreg xcmsdb xgamma xhost
 Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
-Provides: xsetroot xstdcmap xvidtune
+Provides: xsetroot xstdcmap
 
 %description
 A collection of utilities used to tweak and query the runtime configuration
@@ -89,12 +85,11 @@ Utility to perform keystone adjustments 
 %endif
 
 %prep
-%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16
+%setup -q -c %{name}-%{version} -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15
 
 %patch1100 -p0 -b .datadir-rgbpath-fix
 %patch1200 -p0 -b .xprint
 #%patch1700 -p0 -b .datadir-app-defaults-fix
-%patch1700 -p1 -b .buffer-stomp
 
 %build
 
@@ -117,13 +112,6 @@ Utility to perform keystone adjustments 
 	    autoconf
 	    %configure
 	    ;;
-         xvidtune-*)
-            # FIXME: run autotools junk to kick in our patch
-            aclocal --force
-            automake -f
-            autoconf
-            %configure
-            ;;
          *)
             %configure
             ;;
@@ -173,10 +161,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xsetpointer
 %{_bindir}/xsetroot
 %{_bindir}/xstdcmap
-%{_bindir}/xvidtune
 %dir %{_datadir}/X11
 %{_datadir}/X11/rgb.txt
-%{_datadir}/X11/app-defaults/Xvidtune
 %{_mandir}/man1/iceauth.1*
 %{_mandir}/man1/sessreg.1*
 %{_mandir}/man1/showrgb.1*
@@ -192,7 +178,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xsetpointer.1*
 %{_mandir}/man1/xsetroot.1*
 %{_mandir}/man1/xstdcmap.1*
-%{_mandir}/man1/xvidtune.1*
 
 %if %{with_xkeystone}
 %files -n xkeystone
@@ -201,6 +186,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 7.4-8
+- Drop xvidtune, move it to -apps to isolate libXaw deps
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xvidtune-1.0.1-buffer-stomp.patch DELETED ---