Hello community,
here is the log from the commit of package xosview for openSUSE:Factory
checked in at Sat Jun 6 00:18:01 CEST 2009.
--------
--- xosview/xosview.changes 2008-11-25 11:49:08.000000000 +0100
+++ xosview/xosview.changes 2009-06-05 15:27:23.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jun 5 15:27:05 CEST 2009 - coolo@novell.com
+
+- rediff irda to avoid fuzz
+- fix build with glibc 2.10
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xosview.spec ++++++
--- /var/tmp/diff_new_pack.e26332/_old 2009-06-06 00:17:18.000000000 +0200
+++ /var/tmp/diff_new_pack.e26332/_new 2009-06-06 00:17:18.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xosview (Version 1.8.3)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
# This because /usr/bin/xrdb is part of xorg-x11
Requires: xorg-x11
Version: 1.8.3
-Release: 198
+Release: 199
Summary: System Load Information
Url: http://sourceforge.net/projects/xosview/
Source: xosview-%{version}.tar.bz2
@@ -152,6 +152,9 @@
%doc %{_docdir}/xosview/README.linux
%changelog
+* Fri Jun 05 2009 coolo@novell.com
+- rediff irda to avoid fuzz
+- fix build with glibc 2.10
* Tue Nov 25 2008 werner@suse.de
- xorg-11 is required as xrdb is required (bnc#448059)
* Thu May 15 2008 werner@suse.de
@@ -262,7 +265,7 @@
- Fix bug #12756: increase buffer size
* Mon Jan 14 2002 schwab@suse.de
- Fix dependency generation.
-* Wed Dec 12 2001 garloff@suse.de
+* Thu Dec 13 2001 garloff@suse.de
- Restrict num. of IRQs to 64 on AXP if ridiculous numbers (>256)
are detected. (We can't display them anyway ...)
* Wed Nov 14 2001 werner@suse.de
@@ -338,7 +341,7 @@
- New version 1.6.0
- Remove suid bit from binary
- Add a message for sending after installation
-* Wed Feb 11 1998 werner@suse.de
+* Thu Feb 12 1998 werner@suse.de
- New revision
* Tue Nov 04 1997 werner@suse.de
- New revision
++++++ xosview-1.8.0-irda.patch ++++++
--- /var/tmp/diff_new_pack.e26332/_old 2009-06-06 00:17:18.000000000 +0200
+++ /var/tmp/diff_new_pack.e26332/_new 2009-06-06 00:17:18.000000000 +0200
@@ -1,8 +1,10 @@
---- linux/netmeter.cc
-+++ linux/netmeter.cc Fri Jul 19 13:12:52 2002
-@@ -173,11 +173,21 @@
- ifs.ignore(1024, ':');
- ifs >> in >> ig >> ig >> ig >> ig >> ig >> ig >> ig >> out;
+Index: linux/netmeter.cc
+===================================================================
+--- linux/netmeter.cc.orig
++++ linux/netmeter.cc
+@@ -201,12 +201,22 @@ void NetMeter::checkeventNew(void)
+ ifs >> ig >> ig >> ig >> ig >> ig >> ig >> ig >> out;
+ }
- if (!ifs.eof())
+ if (ifs.eof())
@@ -12,7 +14,7 @@
+ ifs.ignore(1024, '\n');
+ break;
}
-+
+
+ if (ifs.fail())
+ {
+ ifs.clear();
@@ -22,6 +24,7 @@
+
+ totin += in;
+ totout += out;
-
++
ifs.ignore(1024, '\n');
}
+ }
++++++ xosview-1.8.3.dif ++++++
--- /var/tmp/diff_new_pack.e26332/_old 2009-06-06 00:17:18.000000000 +0200
+++ /var/tmp/diff_new_pack.e26332/_new 2009-06-06 00:17:18.000000000 +0200
@@ -1,5 +1,7 @@
---- .pkgextract
-+++ .pkgextract 2006-07-26 18:08:30.000000000 +0200
+Index: .pkgextract
+===================================================================
+--- /dev/null
++++ .pkgextract
@@ -0,0 +1,10 @@
+patch -p0 -s --suffix=".serial" < ../xosview-1.8.2-serial.patch
+patch -p0 -s --suffix=".procsys" < ../xosview-1.8.1-procsys.patch
@@ -11,8 +13,10 @@
+patch -p0 -s --suffix=".conf" < ../xosview-1.8.2-configure.patch
+patch -p0 -s --suffix=".appdef" < ../xosview-1.8.3-appdef.dif
+#patch -p0 -s --suffix=".diskstat" < ../xosview-1.8.3-diskstat.dif
---- README.linux
-+++ README.linux 2006-07-26 18:08:30.000000000 +0200
+Index: README.linux
+===================================================================
+--- README.linux.orig
++++ README.linux
@@ -26,7 +26,7 @@ To install xosview:
to /usr/bin/X11/xosview and will be suid root. If you do not want to
run xosview suid root (this will just disable the serial meters) you
@@ -22,8 +26,10 @@
To run xosview :
---- README.security
-+++ README.security 2006-07-26 18:08:30.000000000 +0200
+Index: README.security
+===================================================================
+--- /dev/null
++++ README.security
@@ -0,0 +1,35 @@
+
+Xosview, serial meters, and suid bit
@@ -60,8 +66,10 @@
+
+ Your SuSE Team
+
---- Xdefaults.in
-+++ Xdefaults.in 2006-07-27 13:58:15.000000000 +0200
+Index: Xdefaults.in
+===================================================================
+--- Xdefaults.in.orig
++++ Xdefaults.in
@@ -16,130 +16,131 @@
! General Resources
@@ -501,8 +509,10 @@
+*NFSStatDecay: True
+*NFSStatGraph: False
+*NFSStatUsedFormat: percent
---- Xrm.h
-+++ Xrm.h 2007-03-16 15:30:54.000000000 +0100
+Index: Xrm.h
+===================================================================
+--- Xrm.h.orig
++++ Xrm.h
@@ -34,7 +34,7 @@ public:
private:
XrmDatabase _db;
@@ -512,8 +522,10 @@
//void getArgs(int argc, char **argv);
static Bool enumCB(XrmDatabase *, XrmBindingList bindings,
---- bitmeter.cc
-+++ bitmeter.cc 2006-07-26 18:10:55.000000000 +0200
+Index: bitmeter.cc
+===================================================================
+--- bitmeter.cc.orig
++++ bitmeter.cc
@@ -94,9 +94,9 @@ void BitMeter::draw( void ){
int offset;
@@ -526,8 +538,10 @@
parent_->drawString( x_ - offset + 1, y_ + height_, title_ );
parent_->setForeground( onColor_ );
---- defresources.awk
-+++ defresources.awk 2007-03-16 15:32:20.000000000 +0100
+Index: defresources.awk
+===================================================================
+--- defresources.awk.orig
++++ defresources.awk
@@ -28,7 +28,7 @@ BEGIN {
# general.h file. Let's let this .cc file do that, since it doesn't
# have an associated header file.
@@ -537,8 +551,10 @@
}
#
---- fieldmeter.cc
-+++ fieldmeter.cc 2006-07-27 13:45:40.000000000 +0200
+Index: fieldmeter.cc
+===================================================================
+--- fieldmeter.cc.orig
++++ fieldmeter.cc
@@ -196,9 +196,9 @@ FieldMeter<F>::draw( void ){
int offset;
@@ -569,8 +585,10 @@
/* For now, we can only print 3 characters, plus the optional
* suffix, without overprinting the legends. Thus, we can
* print 965, or we can print 34, but we can't print 34.7 (the
---- general.h
-+++ general.h 2007-03-16 11:21:50.000000000 +0100
+Index: general.h
+===================================================================
+--- general.h.orig
++++ general.h
@@ -66,13 +66,13 @@ enum bool { FALSE = 0, false = 0, TRUE =
* identifier for the char*'s, hence the definition of
* CVSID_DOT_H2 etc., which are occasionally needed. */
@@ -589,8 +607,10 @@
#else
/* Don't put the CVS Id strings in the .o files -- the
compiler will probably print tons of warning about
---- llist.cc
-+++ llist.cc 2007-03-16 15:56:22.000000000 +0100
+Index: llist.cc
+===================================================================
+--- llist.cc.orig
++++ llist.cc
@@ -242,24 +242,32 @@ void *LList::findc( int which ){
}
@@ -628,8 +648,10 @@
for ( ; i > 0 ; i-- ) {
if ( ( buf = new char[size] ) == NULL ) return ( 0 );
---- main.cc
-+++ main.cc 2007-03-16 15:33:22.000000000 +0100
+Index: main.cc
+===================================================================
+--- main.cc.orig
++++ main.cc
@@ -14,7 +14,7 @@ CVSID("$Id$");
int main( int argc, char *argv[] ) {
/* Icky. Need to check for -name option here. */
@@ -639,8 +661,10 @@
while (argp && *argp)
{
if (!strncmp(*argp, "-name", 6))
---- xosview.1
-+++ xosview.1 2006-07-26 18:08:30.000000000 +0200
+Index: xosview.1
+===================================================================
+--- xosview.1.orig
++++ xosview.1
@@ -345,7 +345,7 @@ and \'purple\'):
The following is a list of X resources supported by \fIxosview\fP. Each has
a default value assigned to it. These values can be found in the file
@@ -650,8 +674,10 @@
$HOME/.Xdefaults, etc.).
It should be noted that it is OK to have a resource defined for a port of
---- xosview.cc
-+++ xosview.cc 2007-03-16 15:48:58.000000000 +0100
+Index: xosview.cc
+===================================================================
+--- xosview.cc.orig
++++ xosview.cc
@@ -9,6 +9,7 @@
#include