2006-02-22 Jeremy Katz <katzj@redhat.com>

	* lang-table: Set all previously bterm using languages to "none"
	for the fact that we can't handle them in text-mode anymore
	* textw/language_text.py (LanguageWindow.__call__): Remove bterm
	special-casing.
	* text.py (InstallInterface.run): Likewise.
	* loader2/lang.c (setupLanguage): Likewise.
	* language.py (Language.fixLang): No more "bterm" font
	* stubs/unicode-lite.c: Don't require wlite
	* stubs/Makefile: Don't link against wlite
	* loader2/Makefile: No more linking to bterm here either
	* isys/lang.c: Remove bterm support code.
	* isys/lang.h: And declaration.
	* isys/Makefile (LOADLIBES): No more linking to bterm
	* isys/isys.c (start_bterm): Remove this
	* anaconda.spec (BuildPreReq): Bye-bye bogl

4 files changed, 1 insertions, 46 deletions

diff --git a/isys/Makefile b/isys/Makefile
index 626ffc428..ae8c37ac2 100644
--- a/isys/Makefile
+++ b/isys/Makefile
@@ -8,7 +8,7 @@ OBJECTS = nfsmount.o nfsmount_clnt.o nfsmount_xdr.o imount.o getmacaddr.o \
 	  ethtool.o getipaddr.o wireless.o eddsupport.o
 SOBJECTS = $(patsubst %.o,%.lo,$(OBJECTS))
 SOURCES = $(patsubst %.o,%.c,$(OBJECTS)) isys.c
-LOADLIBES = -lresolv -lpci -lpopt -lpump -lext2fs -lz -lbterm -lbogl -lwlite -lkudzu -lpci -ldevmapper -lselinux -lsepol
+LOADLIBES = -lresolv -lpci -lpopt -lpump -lext2fs -lz -lkudzu -lpci -ldevmapper -lselinux -lsepol
 PYMODULES = _isys.so
 SUBDIRS = gzlib
 DIET = diet
diff --git a/isys/isys.c b/isys/isys.c
index ac16705cf..bb1073200 100644
--- a/isys/isys.c
+++ b/isys/isys.c
@@ -107,7 +107,6 @@ static PyObject * doGetPageSize(PyObject * s, PyObject * args);
 static PyObject * py_bind_textdomain_codeset(PyObject * o, PyObject * args);
 static PyObject * getLinkStatus(PyObject * s, PyObject * args);
 static PyObject * hasIdeRaidMagic(PyObject * s, PyObject * args);
-static PyObject * start_bterm(PyObject * s, PyObject * args);
 static PyObject * py_getDasdPorts(PyObject * s, PyObject * args);
 static PyObject * py_isUsableDasd(PyObject * s, PyObject * args);
 static PyObject * py_isLdlDasd(PyObject * s, PyObject * args);
@@ -167,7 +166,6 @@ static PyMethodDef isysModuleMethods[] = {
     { "bind_textdomain_codeset", (PyCFunction) py_bind_textdomain_codeset, METH_VARARGS, NULL},
     { "getLinkStatus", (PyCFunction) getLinkStatus, METH_VARARGS, NULL },
     { "hasIdeRaidMagic", (PyCFunction) hasIdeRaidMagic, METH_VARARGS, NULL },
-    { "startBterm", (PyCFunction) start_bterm, METH_VARARGS, NULL },
     { "getDasdPorts", (PyCFunction) py_getDasdPorts, METH_VARARGS, NULL},
     { "isUsableDasd", (PyCFunction) py_isUsableDasd, METH_VARARGS, NULL},
     { "isLdlDasd", (PyCFunction) py_isLdlDasd, METH_VARARGS, NULL},
@@ -1474,12 +1472,6 @@ static PyObject * hasIdeRaidMagic(PyObject * s, PyObject * args) {
 #endif
 }
 
-static PyObject * start_bterm(PyObject * s, PyObject * args) {
-    if (!PyArg_ParseTuple(args, "")) return NULL;
-
-    return Py_BuildValue("i", isysStartBterm());
-}
-
 static PyObject * doProbeBiosDisks(PyObject * s, PyObject * args) {
     if (!PyArg_ParseTuple(args, "")) return NULL;
 
diff --git a/isys/lang.c b/isys/lang.c
index 4625a6b51..cacce4fe7 100644
--- a/isys/lang.c
+++ b/isys/lang.c
@@ -183,39 +183,3 @@ int isysLoadKeymap(char * keymap) {
 
     return rc;
 }
-
-/* returns 0 on success, 1 on failure */
-extern int bterm_main(int argc, char **argv);
-
-int isysStartBterm(void) {
-    char * btermargs[4] = { "bterm", "-s", "-f", NULL };
-    int rc;
-    struct stat sb;
-
-    /* if we've already successfully started bterm, we don't need to again */
-    if (!access("/var/run/bterm.run", R_OK))
-        return 0;
-
-    /* assume that if we're already on a pty we can handle unicode */
-    fstat(0, &sb);
-    if (major(sb.st_rdev) == 3 || major(sb.st_rdev) == 136)
-	return 0;
-
-    if (!access("/usr/lib/bogl/font.bgf.gz", R_OK))
-	btermargs[3] = "/usr/lib/bogl/font.bgf.gz";
-    else if (!access("/etc/font.bgf.gz", R_OK))
-	btermargs[3] = "/etc/font.bgf.gz";
-    else if (!access("font.bgf.gz", R_OK))
-	btermargs[3] = "font.bgf.gz";
-    else
-        return 1;
-
-    rc = bterm_main(4, btermargs);
-
-    if (!rc) {
-        int fd = open("/var/run/bterm.run", O_CREAT | O_TRUNC | O_RDWR, 0600);
-        close(fd);
-    }
- 
-    return rc;
-}
diff --git a/isys/lang.h b/isys/lang.h
index 2fd6c1c5b..55e5769a1 100644
--- a/isys/lang.h
+++ b/isys/lang.h
@@ -21,6 +21,5 @@ int loadKeymap(gzFile stream);
 int isysLoadFont(void);
 int isysLoadKeymap(char * keymap);
 int isysSetUnicodeKeymap(void);
-int isysStartBterm(void);
 
 #endif