updated

3 files changed, 16 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index c7b3b75..a6a69d3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,14 +4,17 @@ SUBDIRS = po
 localedir = $(prefix)/usr/share/locale
 RPM=$(HOME)/rpm
 
-override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\"
+#override CFLAGS += -DPACKAGE=\"$(NAME)\" -DLOCALEDIR=\"$(localedir)\"
 
-all: transfugdrake
-	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
+all: transfug_oe
+	#for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
+
+transfug_oe: transfug_oe.c
+	$(CC) $(CFLAGS) -o transfug_oe transfug_oe.c
 
 clean:
 	$(MAKE) -C po $@
-	rm -f smbdrake core .#*[0-9]
+	rm -f core transfug_oe
 	for d in $(SUBDIRS); do ( cd $$d ; make $@ ) ; done
 
 install: all
diff --git a/transfug_oe.c b/transfug_oe.c
index ee2eaaf..0cf871e 100644
--- a/transfug_oe.c
+++ b/transfug_oe.c
@@ -149,7 +149,7 @@ int oe_readmessage(oe_data *data,
 #ifdef DEBUG
       printf("%.8x : \n",pos-segheadsize);
 #endif
-      data->oput("From liboe@linux  Sun Jun 11 19:48:24 2000\n");
+      data->oput("From mandrake@MandrakeLinux Mon Jun 11 10:00:00 2001\n");
       headerwritten = 1;
     }
     while (pos<endofsegment) {
@@ -396,28 +396,9 @@ oe_data* oe_readmbox(char* filename,void (*oput)(char*)) {
   fclose(data->oe);
   return data;
 }
-/* OE2MBX 1.21
+/* based on OE2MBX 1.21
    Copyright (C) 2000 Stephan B. Nedregaard (stephan@micropop.com) */
 
-/*  This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #ifdef WINDOWS
 #define SLASH '\\'
 #else
@@ -429,9 +410,10 @@ char *filename = NULL, *fn;
 
 void msgandquit(int h) {
   if (h==0)
-    printf("transfug_oe\nSyntax: transfug_oe [oe_mbox] based on OE2MBX 1.21 (c) 2000 Stephan B. Nedregaard - stephan@micropop.com");
+    printf("transfug_oe\nSyntax: transfug_oe [oe_mbox]*\n"
+	   "based on OE2MBX 1.21 (c) 2000 Stephan B. Nedregaard - stephan@micropop.com\n");
   else if (h==1) 
-    printf("OE2MBX cannot run on this platform. Please consult the Web site at http://www.micropop.com/code/");
+    printf("OE2MBX cannot run on this platform. Please consult the Web site at http://www.micropop.com/code/\n");
   exit(h);
 }
 
diff --git a/transfugdrake.spec b/transfugdrake.spec
index 000b636..09db615 100644
--- a/transfugdrake.spec
+++ b/transfugdrake.spec
@@ -5,16 +5,16 @@
 Summary:	A wizard to moves from Windows to MandrakeLinux
 Name:		%{name}
 Version:	%{version}
-Release:    1mdk
+Release:	1mdk
 # get the source from our cvs repository (see
 # http://www.linuxmandrake.com/en/cvs.php3)
 Source0:	%{name}-%{version}.tar.bz2
 Source1:	%{name}16.xpm.bz2
 Source2:	%{name}32.xpm.bz2
 Source3:	%{name}48.xpm.bz2
-Copyright:	GPL
+License:	GPL
 Group:		System/Configuration/Other
-Requires:	drakxtools >= 1.1.5-97mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode, drakfloppy >= 0.43-1mdk, harddrake >= 0.9.3-17mdk, drakfont >= 0.58-11mdk, XFree86-100dpi-fonts, menudrake >= 0.6-5mdk
+Requires:	drakxtools >= 1.1.5-97mdk, gtk+mdk, perl-GTK, perl-GTK-GdkImlib, usermode
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 
 %description
@@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc ChangeLog README TRANSLATORS AUTHORS
 %{_prefix}/X11R6/bin/*
-%{_menudir}/smbdrake
+%{_menudir}/transfugdrake
 %{_miconsdir}/*.xpm
 %{_iconsdir}/*.xpm
 %{_liconsdir}/*.xpm