rpms/rhgb/devel rhgb-0.16.2-dont-switch-vts-on-timeout.patch, NONE, 1.1 rhgb-0.16.2-drop-internal-gtk-expander.patch, NONE, 1.1 rhgb.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/rhgb/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21467

Modified Files:
	rhgb.spec 
Added Files:
	rhgb-0.16.2-dont-switch-vts-on-timeout.patch 
	rhgb-0.16.2-drop-internal-gtk-expander.patch 
Log Message:
- add BuildRequires: gettext
- don't build in-tree copy of gtkexpander.c
- don't switch to vt1 automatically after 35 seconds (bug 135783)


rhgb-0.16.2-dont-switch-vts-on-timeout.patch:
 main.c |    8 --------
 1 files changed, 8 deletions(-)

--- NEW FILE rhgb-0.16.2-dont-switch-vts-on-timeout.patch ---
--- rhgb-0.16.2/src/main.c.dont-switch-vts-on-timeout	2005-10-31 15:08:30.000000000 -0500
+++ rhgb-0.16.2/src/main.c	2005-10-31 15:13:41.000000000 -0500
@@ -299,14 +299,6 @@
         splash_show_details(splash);
 	switched_details = 1;
     }
-    if ((pipe_timeout >= 35) && (connection_timeout >= 35) &&
-        (switched_vt1 == 0)) {
-        /*
-	 * something really bad is going on switch to text mode
-	 */
-        switch_to_vt(1);
-	switched_vt1 = 1;
-    }
 
     /*
      * those timeouts are needed in the last phase to detect X/gdm

rhgb-0.16.2-drop-internal-gtk-expander.patch:
 Makefile.am |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

--- NEW FILE rhgb-0.16.2-drop-internal-gtk-expander.patch ---
--- rhgb-0.16.2/src/Makefile.am.drop-internal-gtk-expander	2005-10-31 14:32:19.000000000 -0500
+++ rhgb-0.16.2/src/Makefile.am	2005-10-31 14:32:41.000000000 -0500
@@ -3,17 +3,13 @@
 	splash.h	\
 	splash.c	\
 	set-keymap.c	\
-	set-keymap.h	\
-	gtkexpander.h	\
-	gtkexpander.c
+	set-keymap.h
 
 rhgb_LDFLAGS = $(RHGB_LIBS) -lpopt -lxf86config
 
 splash_SOURCES = \
 	splash.h	\
-	splash.c	\
-	gtkexpander.h	\
-	gtkexpander.c
+	splash.c
 
 splash_LDFLAGS = $(RHGB_LIBS) -lpopt
 splash_CFLAGS = $(RHGB_CFLAGS) -DSPLASH_MAIN


Index: rhgb.spec
===================================================================
RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- rhgb.spec	26 Oct 2005 20:27:31 -0000	1.27
+++ rhgb.spec	31 Oct 2005 20:52:02 -0000	1.28
@@ -3,7 +3,7 @@
 Summary: Red Hat Graphical Boot
 Name: rhgb
 Version: 0.16.2
-Release: 8
+Release: 9
 URL: http://www.redhat.com/
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -11,10 +11,13 @@
 BuildRoot: %{_tmppath}/%{name}-root
 ExcludeArch: s390 s390x ppc64
 BuildRequires: vte-devel
+BuildRequires: gettext
 Requires: initscripts >= 7.22-1
 
 Patch0: rhgb-0.16.2-reap-child.patch
 Patch1: rhgb-0.16.2-init-utf8.patch
+Patch2: rhgb-0.16.2-dont-switch-vts-on-timeout.patch 
+Patch3: rhgb-0.16.2-drop-internal-gtk-expander.patch
 
 %description
 Red Hat Graphical Boot provides a clean and simple interface to the boot process
@@ -23,6 +26,8 @@
 %setup -q
 %patch0 -p1 -b .reap-child
 %patch1 -p1 -b .init-utf8
+%patch2 -p1 -b .dont-switch-vts-on-timeout
+%patch3 -p1 -b .drop-internal-gtk-expander
 
 %build
 %configure
@@ -30,7 +35,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang %{gettext_package}
 
@@ -47,6 +52,11 @@
 %doc doc/HOW_IT_WORKS
 
 %changelog
+* Mon Oct 31 2005 Ray Strode <rstrode at redhat.com> 0.16.2-9
+- add BuildRequires: gettext
+- don't build in-tree copy of gtkexpander.c
+- don't switch to vt1 automatically after 35 seconds (bug 135783)
+
 * Wed Oct 26 2005 Ray Strode <rstrode at redhat.com> 0.16.2-8
 - clumens, zombie-hunter, spotted another one of the 
   brain eaters