rpms/rhgb/F-8 rhgb-0.17.7-small.patch,1.1,1.2 rhgb.spec,1.89,1.90

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/rhgb/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29882

Modified Files:
	rhgb-0.17.7-small.patch rhgb.spec 
Log Message:
- More fixes from John Boyd.


rhgb-0.17.7-small.patch:

Index: rhgb-0.17.7-small.patch
===================================================================
RCS file: /cvs/pkgs/rpms/rhgb/F-8/rhgb-0.17.7-small.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rhgb-0.17.7-small.patch	17 May 2008 14:55:21 -0000	1.1
+++ rhgb-0.17.7-small.patch	20 May 2008 02:19:57 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up rhgb-9.0.0/src/splash.c.small rhgb-9.0.0/src/splash.c
---- rhgb-9.0.0/src/splash.c.small	2008-05-15 13:42:50.000000000 -0400
-+++ rhgb-9.0.0/src/splash.c	2008-05-17 10:04:30.000000000 -0400
+--- rhgb-9.0.0/src/splash.c.small	2008-05-17 10:46:26.000000000 -0400
++++ rhgb-9.0.0/src/splash.c	2008-05-17 10:54:57.000000000 -0400
 @@ -48,8 +48,21 @@ static GdkColor highlight = {0, 0x0e0e, 
  static GdkColor prelight = {0, 0x0e0e, 0x2424, 0x4545};
  #define N_STEPS 20
@@ -113,7 +113,7 @@
    splash->details_throbber = gtk_image_new ();
    gtk_box_pack_start (GTK_BOX (hbox), splash->details_throbber, FALSE, FALSE, 0);
  
-+  (void) gdk_pixbuf_get_file_info(SYSTEM_LOGO_FILE, &logo_width, &logo_height);
++  (void) gdk_pixbuf_get_file_info(MAIN_LOGO_FILE, &logo_width, &logo_height);
  
    splash->details_terminal = vte_terminal_new();
 -  vte_terminal_set_font_from_string (VTE_TERMINAL (splash->details_terminal), "monospace 12");
@@ -127,11 +127,13 @@
    vte_terminal_fork_command (VTE_TERMINAL (splash->details_terminal),
  			     "/sbin/change_console",
  			     (char **) init_redirect,
-@@ -533,21 +552,18 @@ splash_new (void)
+@@ -533,21 +552,20 @@ splash_new (void)
    align = gtk_alignment_new (1.0, 0.5, 1.0, 1.0);
    gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE, 0);
  
 -  if (screen_height < 768)
++  (void) gdk_pixbuf_get_file_info(SYSTEM_LOGO_FILE, &logo_width, &logo_height);
++
 +  if (LOGO_SCL(screen_height) < logo_height || 
 +      LOGO_SCL(screen_width) < logo_width)
      {


Index: rhgb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhgb/F-8/rhgb.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- rhgb.spec	17 May 2008 14:55:21 -0000	1.89
+++ rhgb.spec	20 May 2008 02:19:57 -0000	1.90
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.17.7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@
 %dir %{_sysconfdir}/rhgb/temp
 
 %changelog
+* Mon May 19 2008 Ray Strode <rstrode at redhat.com> 0.17.7-6
+- More fixes from John Boyd.
+
 * Sat May 17 2008 Ray Strode <rstrode at redhat.com> 0.17.7-5
 - Add patch from John Boyd <jaboydjr at netwalk.com> to better
   support the Eeepc.