rpms/xorg-x11/FC-4 xorg-x11.spec,1.202,1.203

[fedora-cvs-commits redhat com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv21647

Modified Files:
	xorg-x11.spec 
Log Message:
Update Release field, and %changelog for FC4 update


Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/FC-4/xorg-x11.spec,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- xorg-x11.spec	31 Aug 2005 22:59:37 -0000	1.202
+++ xorg-x11.spec	31 Aug 2005 23:33:24 -0000	1.203
@@ -19,7 +19,12 @@
 Name: xorg-x11
 Version: 6.8.2
 #Release: 45
-#Release: 1.FC3.45
+#Release: ?.FC3.45
+# FC4 package Release number is "m.FC4.n.s", where "m" is the last integral
+# FC4 rpm build officially released for FC4 as an update, which is '37',
+# and "n" is the FC devel rpm release that this update is based upon. ".s"
+# is optional, and only needed if we need to specially modify/update the
+# FC4 build differing from the -devel build
 Release: 37.FC4.45
 
 %define build_mharris_mode	0
@@ -3602,6 +3607,12 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Wed Aug 31 2005 Mike A. Harris <mharris redhat com> 6.8.2-37.FC4.45
+- Merge developmental changes from FC "devel" branch of CVS into FC4
+  branch for FC4 update.
+- Rebuild FC-devel 6.8.2-45 release as 6.8.2-37.FC4.45 for FC4 update.
+
+ Kristian Høgsberg <krh redhat com> 6.8.2-45
 * Fri Jul 29 2005 Kristian Høgsberg <krh redhat com> 6.8.2-45
 - Disable xorg-x11-6.8.2-libvgahw-workaround-rh161242.patch and
   rebuild with gcc-4.0.1-4 which has a workaround for the gcc
@@ -3680,7 +3691,7 @@
 * Mon May 30 2005 Mike A. Harris <mharris redhat com> 6.8.2-36
 - Added xorg-x11-6.8.2-ia64-elfloader-cache-flush.patch to fix cache flush
   issue on ia64 systems (#153103)
-============================================================================
+
 * Wed May 25 2005 Mike A. Harris <mharris redhat com> 6.8.2-35
 - Remove /usr/X11R6/lib/X11/xinit symlink on non with_Xserver builds to
   prevent rpm complaining about unpackaged symlinks on s390 et al. now that