rpms/aterm/FC-4 aterm-cleanup.patch,NONE,1.1 aterm.spec,1.7,1.8

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/aterm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10894

Modified Files:
	aterm.spec 
Added Files:
	aterm-cleanup.patch 
Log Message:
- backport from 1.00beta2 to close #149366
- add dist


aterm-cleanup.patch:

--- NEW FILE aterm-cleanup.patch ---
--- src/scrollbar2.c.orig	2005-06-01 00:38:04.000000000 +0200
+++ src/scrollbar2.c	2005-06-01 00:39:11.000000000 +0200
@@ -647,7 +647,7 @@
 int
 scrollbar_show(int update)
 {
-    scrollbar_show_cached(update, 0);
+    return scrollbar_show_cached(update, 0);
 }
 
 
--- src/pixmap.c.orig	2005-06-01 00:38:20.000000000 +0200
+++ src/pixmap.c	2005-06-01 00:38:45.000000000 +0200
@@ -607,7 +607,7 @@
 
 
 /* PROTO */
-Pixmap
+void
 SetSrcPixmap(Pixmap p)
 {
     if( BG.srcPixmap != None && BG.bMySource )


Index: aterm.spec
===================================================================
RCS file: /cvs/extras/rpms/aterm/FC-4/aterm.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- aterm.spec	6 Apr 2005 22:11:11 -0000	1.7
+++ aterm.spec	31 May 2005 22:51:11 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           aterm
 Version:        0.4.2
-Release:        6
+Release:        7%{?dist}
 
 Summary:        Afterstep XVT, VT102 emulator for the X Window system
 Group:          User Interface/X
@@ -8,9 +8,10 @@
 URL:            http://aterm.sourceforge.net
 Source0:        http://dl.sf.net/aterm/%{name}-%{version}.tar.gz
 Source1:        aterm.desktop
+Patch0:         aterm-cleanup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
-BuildRequires:  XFree86-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  desktop-file-utils
 
 %description
@@ -27,7 +28,7 @@
 
 %prep
 %setup -q
-
+%patch0
 
 %build
 %configure --enable-utmp \
@@ -72,6 +73,10 @@
 
 
 %changelog
+* Wed Jun 01 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- backport from 1.00beta2 to close #149366
+- add dist
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt