Tue Jan 18 16:47:54 PST 2000 Michael Jennings <mej@eterm.org>

Some background-related changes since I'm redoing the backgrounds
	collection (i.e., removing the cool-but-too-busy-or-bright pics).


SVN revision: 1943

ChangeLog

@@ -3053,3 +3053,9 @@ Mon Jan 17 13:27:52 PST 2000	Michael Jennings <mej@eterm.org>
 	setting.
 	
 -------------------------------------------------------------------------------
+Tue Jan 18 16:47:54 PST 2000	Michael Jennings <mej@eterm.org>
+
+	Some background-related changes since I'm redoing the backgrounds
+	collection (i.e., removing the cool-but-too-busy-or-bright pics).
+	
+-------------------------------------------------------------------------------

Eterm.spec.in

@@ -1,5 +1,5 @@
 %define ver      @VERSION@
-%define rel      1
+%define rel      2
 %define prefix   @prefix@
 
 Summary: Enlightened terminal emulator
@@ -9,9 +9,7 @@ Release: %{rel}
 Copyright: BSD
 Group: User Interface/X
 Source0: ftp://ftp.eterm.org/pub/Eterm/Eterm-%{ver}.tar.gz
-Source1: ftp://ftp.eterm.org/pub/Eterm/Eterm-bg-scale-1.tar.gz
-Source2: ftp://ftp.eterm.org/pub/Eterm/Eterm-bg-scale-2.tar.gz
-Source3: ftp://ftp.eterm.org/pub/Eterm/Eterm-bg-tile.tar.gz
+Source1: ftp://ftp.eterm.org/pub/Eterm/Eterm-bg-%{ver}.tar.gz
 URL: http://www.eterm.org/
 BuildRoot: /var/tmp/Eterm-root
 Requires: imlib >= 1.9.6
@@ -72,9 +70,7 @@ gzip $RPM_BUILD_ROOT%{prefix}/man/man1/*
  for i in tiled-pixmaps.list scaled-pixmaps.list pixmaps.list ; do \
   mv $i $i.base ; done)
 
-tar xvfz %{SOURCE1}
-tar xvfz %{SOURCE2}
-tar xvfz %{SOURCE3}
+tar -zxvf %{SOURCE1}
 
 make -C bg all
 make -C bg prefix=$RPM_BUILD_ROOT%{prefix} install
@@ -89,7 +85,7 @@ cat > rpm-Eterm-bg-files <<EOF
 EOF
 find ./bg/ -type f -not -name '*.list' -not -name 'Makefile*' \
        -not -name 'README*' -not -name 014.png \
-        -not -name 40.png -not -name 6.png -not -name backwave.jpg \
+        -not -name 40.png -not -name blackstone.png -not -name backwave.jpg \
         -not -name circuit.png -not -name nebula.jpg \
         -not -name fourthday.jpg -not -name gaia.jpg \
         -not -name galleon.jpg -not -name night_of_the_dragon.jpg \
@@ -128,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/Eterm/themes
 %{prefix}/share/Eterm/pix/014.png
 %{prefix}/share/Eterm/pix/40.png
-%{prefix}/share/Eterm/pix/6.png
+%{prefix}/share/Eterm/pix/blackstone.png
 %{prefix}/share/Eterm/pix/backwave.jpg
 %{prefix}/share/Eterm/pix/circuit.png
 %{prefix}/share/Eterm/pix/nebula.jpg

src/command.c

@@ -2180,7 +2180,7 @@ run_command(char *argv[])
 
       argv0 = my_basename(shell);
       if (Options & Opt_loginShell) {
-	char *p = MALLOC((strlen(argv0) + 2) * sizeof(char));
+	char *p = MALLOC(strlen(argv0) + 2);
 
 	p[0] = '-';
 	strcpy(&p[1], argv0);

src/startup.c

@@ -242,7 +242,7 @@ eterm_bootstrap(int argc, char *argv[])
     display_name = val;		/* use broken `:0' value */
 
   i = strlen(val);
-  display_string = MALLOC((i + 9));
+  display_string = MALLOC(i + 9);
 
   sprintf(display_string, "DISPLAY=%s", val);
   sprintf(windowid_string, "WINDOWID=%u", (unsigned int) TermWin.parent);
@@ -263,7 +263,7 @@ eterm_bootstrap(int argc, char *argv[])
   } else {
     if (rs_term_name != NULL) {
       i = strlen(rs_term_name);
-      term_string = MALLOC((i + 6) * sizeof(char));
+      term_string = MALLOC(i + 6);
 
       sprintf(term_string, "TERM=%s", rs_term_name);
       putenv(term_string);