rpms/xosview/F-9 XOsview.png, NONE, 1.1 xosview-1.8.3-app-defaults.patch, NONE, 1.1 xosview-1.8.3-disable-flags.patch, NONE, 1.1 xosview.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Terje Røsten]

Author: terjeros

Update of /cvs/extras/rpms/xosview/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21743/F-9

Modified Files:
	.cvsignore sources 
Added Files:
	XOsview.png xosview-1.8.3-app-defaults.patch 
	xosview-1.8.3-disable-flags.patch xosview.spec 
Log Message:
Sync with rawhide.



xosview-1.8.3-app-defaults.patch:

--- NEW FILE xosview-1.8.3-app-defaults.patch ---
diff -uNr -x '*~' xosview-1.8.3.cvs/config/Makefile.top.in xosview-1.8.3/config/Makefile.top.in
--- xosview-1.8.3.cvs/config/Makefile.top.in	2008-04-03 19:20:54.000000000 +0200
+++ xosview-1.8.3/config/Makefile.top.in	2008-04-03 19:22:05.000000000 +0200
@@ -49,7 +49,7 @@
 PREFIX_TO_USE=@prefix@
 BINDIR=$(PREFIX_TO_USE)/bin
 MANDIR=$(PREFIX_TO_USE)/share/man/man1
-XAPPLOADDIR=$(PREFIX_TO_USE)/lib/X11/app-defaults
+XAPPLOADDIR=$(PREFIX_TO_USE)/share/X11/app-defaults
 PACKAGENAME=xosview-$(VERS)
 DISTRIBDIR=@top_srcdir@/../$(PACKAGENAME)
 
diff -uNr -x '*~' xosview-1.8.3.cvs/Xrm.cc xosview-1.8.3/Xrm.cc
--- xosview-1.8.3.cvs/Xrm.cc	2008-04-03 19:20:55.000000000 +0200
+++ xosview-1.8.3/Xrm.cc	2008-04-03 19:21:43.000000000 +0200
@@ -159,7 +159,7 @@
     XrmQuarkToString(_class));
   if (rfilename != NULL)
     XrmCombineFileDatabase (rfilename, &_db, 1);
-  result = snprintf(rfilename, sizeof rfilename, "/usr/lib/X11/app-defaults/%s",
+  result = snprintf(rfilename, sizeof rfilename, "/usr/share/X11/app-defaults/%s",
     XrmQuarkToString(_class));
   if (result >= 0 && result < (int)sizeof(rfilename))
     XrmCombineFileDatabase (rfilename, &_db, 1);

xosview-1.8.3-disable-flags.patch:

--- NEW FILE xosview-1.8.3-disable-flags.patch ---
--- xosview-1.8.3/config/aclocal.m4~	2008-04-07 21:54:43.000000000 +0200
+++ xosview-1.8.3/config/aclocal.m4	2008-04-07 21:55:52.000000000 +0200
@@ -55,7 +55,7 @@
 
 dnl	For gcc-based (or primarily-gcc) OS's, set EXTRA_CXXFLAGS to -Wall -O4
 AC_DEFUN(AC_GCC_EXTRA_CXXFLAGS, [
-	EXTRA_CXXFLAGS="-W -Wall -O3"
+	EXTRA_CXXFLAGS=""
 ])
 
 AC_DEFUN(SMP_LINUX,


--- NEW FILE xosview.spec ---
%define date   20080301

Name:          xosview
Summary:       An X Window System utility for monitoring system resources
Version:       1.8.3
Release:       13.%{date}cvs%{?dist}

Group:         Applications/System
# The netbsd/swapinternal.{cc,h} source files are BSD only (with 
# advertising), but neither file is used in the linux version of 
# xosview.  Instead, the source files used are linux/swapmeter.{cc,h}, 
# both of which fall under the GPL. All other files are either GPL 
# based, or can fall under either the BSD or GPL copyright.
License:       GPL+
URL:           http://xosview.sourceforge.net/

# A snapshot from %{date} of the source was used due to significant changes 
# that have occurred compared to the current release version. 
# $ cvs -z3 -d:pserver:anonymous at xosview.cvs.sourceforge.net:/cvsroot/xosview \
#     co -P -D%{date} xosview 
# $ mv xosview xosview-1.8.3-%{date}
# $ tar czvf xosview-1.8.3-%{date}.tar.gz xosview-1.8.3-%{date}
Source0:       %{name}-%{version}-%{date}.tar.gz

# An old png file is being used for the icon.  It is located at:
Source1:       http://roxos.sunsite.dk/dev-contrib/guido/XOsview.png

Patch0:        xosview-1.8.3-app-defaults.patch
Patch1:        xosview-1.8.3-disable-flags.patch
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: autoconf libXpm-devel libX11-devel desktop-file-utils

%description
The xosview utility displays a set of bar graphs which show the
current system state, including memory usage, CPU usage, system load,
etc. Xosview runs under the X Window System.

%prep
%setup -q -n %{name}-%{version}-%{date}
%patch0 -p1
%patch1 -p1

%build
./autogen.sh

# From redhat-rpm-config 9.0.3-1 (F-10) config.{guess,sub} are
# not overwritten automatically. The original config.{guess,sub}
# do not work on ppc64
#
# The following /usr/lib cannot be %%_libdir !!
%{__cp} -p /usr/lib/rpm/config.{guess,sub} config/

%configure
%{__make} %{?_smp_mflags} all

cat > %{name}.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=OS Resource Viewer
Comment=
Exec=xosview
Terminal=false
Type=Application
Icon=xosview
Categories=Utility;System;
EOF

%install
%{__rm} -rf %{buildroot}
%{__install} -d %{buildroot}%{_bindir}   \
    %{buildroot}%{_mandir}/man1          \
    %{buildroot}%{_datadir}/icons        \
    %{buildroot}%{_datadir}/applications \
    %{buildroot}%{_datadir}/X11/app-defaults

%{__make} install PREFIX_TO_USE=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
%{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc CHANGES COPYING COPYING.GPL README README.linux TODO
%{_bindir}/%{name}
%{_mandir}/man1/%{name}.1*
%{_datadir}/icons/%{name}.png
%{_datadir}/X11/app-defaults/XOsview
%{_datadir}/applications/%{name}.desktop

%changelog
* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-13.20080301cvs
- Fix license and desktop file

* Mon Sep  8 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-12.20080301cvs
- Drop fedora as vendor
- Use date in cvs checkout

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-11.20080520cvs
- Pulling icon directly from website

* Tue May 20 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-10.20080520cvs
- Added Source1 URL
- Fixed ppc64 config error
- Added -q to %%setup again (deleted by accident in release 9)
- Fixed macros conventions
- Only including README and README.linux files

* Mon May 19 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3-9.20080519cvs
- Fixed naming guidelines (again)
- Removed CXXFLAGS (redundant)

* Fri Apr 25 2008 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> - 1.8.3.20080425cvs-8
- Clarified BSD vs. GPL License Issue
- Pulling source dirctly from CVS
- Removed CVS patch generation file since current CVS snapshot is used
- Removed COPYING.BSD file (see License Section above for explanation)
- Fixed Post-Release Naming Guidelines
- Fixed Categories section in Desktop file

* Thu Apr 17 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-7
- Add cvs patch generation info

* Mon Apr  7 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-6
- Remove extra build flags

* Thu Apr  3 2008 Terje Rosten <terje.rosten at ntnu.no> - 1.8.3-5
- Patches from cvs, remove private patches
- Add app-defaults patch
- Fix license, summary, src url, buildroot and desktop file
- Random clean up

* Wed Feb 20 2008 Chelban Vasile <vchelban at fedoramd.org> 1.8.3-4.prof_k
- BuildRequires: libXpm-devel, libX11-devel
- Removed i386 build restriction

* Sun Dec 16 2007 Dr. Gregory R. Kriehn (Professor Kriehn) <gkriehn at csufresno.edu> xosview-1.8.3-3.fc8.prof_k
- Fixed man location

* Wed Dec 12 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-2.fc8.prof_k
- Cleaned up spec file
- Now includes doc files

* Mon Dec 3 2007 Gregory Kriehn <gkriehn at csufresno.edu> xosview-1.8.3-1.fc8.prof_k
- Recompiled for Fedora 8

* Sun Mar 26 2006 Ron Yorston <rmy at tigress.co.uk> 1.8.3-1.tig1.fc5
- fixes to compile with modular X on FC5

* Wed Jan  2 2005 Ron Yorston <rmy at tigress.co.uk> 1.8.2-1.tig1
- backport from FC3 to RHEL3
- change default reosurce for CPU to 'cpuGraph: False'

* Mon Jul 19 2004 Than Ngo <than at redhat.com> 1.8.2-1
- update to 1.8.2
- remove all patches, which are included in new upstream
- bug #126432, #124156, #124569, #124896

* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-21
- fix PAGE/DISK lines with kernel > 2.5, they work again.

* Wed May 19 2004 Than Ngo <than at redhat.com> 1.8.0-20
- fixed build problem with gcc34

* Wed Mar 10 2004 Than Ngo <than at redhat.com> 1.8.0-19
- added nfs traffic

* Tue Feb 24 2004 Than Ngo <than at redhat.com> 1.8.0-18 
- get rid of rpath

* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jan 20 2004 Than Ngo <than at redhat.com> 1.8.0-16
- add patch to get xosview working on 2.6 kernel

* Tue Jul 08 2003 Than Ngo <than at redhat.com> 1.8.0-15
- cleanup

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Thu May 22 2003 Than Ngo <than at redhat.com> 1.8.0-13
- fix build with gcc 3.3

* Wed Apr 30 2003 Elliot Lee <sopwith at redhat.com> 1.8.0-12
- Fix powerpc64 & ia64 according to the pattern of other non-i386 archs

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.8.0-10
- rebuild on all arches

* Sat Aug 10 2002 Elliot Lee <sopwith at redhat.com>
- rebuilt with gcc-3.2 (we hope)

* Wed Jul 24 2002 Than Ngo <than at redhat.com> 1.8.0-7
- desktop file issue (bug #69551)

* Tue Jul 23 2002 Tim Powers <timp at redhat.com> 1.8.0-6
- build using gcc-3.2-0.1

* Fri Jun 21 2002 Tim Powers <timp at redhat.com> 1.8.0-5
- automated rebuild

* Thu Jun 20 2002 Than Ngo <than at redhat.com> 1.8.0-4
- Don't forcibly strip binaries

* Sun Jun 2 2002 Than Ngo <than at redhat.com> 1.8.0-3
- fix a bug in cpumeter (bug #64798)

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Apr 24 2002 Karsten Hopp <karsten at redhat.de> 1.8.0-1
- update to current version
- redo .proc patch
- change URLs

* Fri Feb 22 2002 Than Ngo <than at redhat.com> 1.7.3-10
- rebuild in new environment.

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Tue Dec 18 2001 Than Ngo <than at redhat.com> 1.7.3-8
- xosview +net goes into hard loop (bug #57150)
- add patch for building against g++ 3
- use RPM_OPT_FLAG

* Wed Nov 14 2001 Than Ngo <than at redhat.com> 1.7.3-7
- added missing Icon in desktop file
- fixed Url

* Wed Sep 12 2001 Tim Powers <timp at redhat.com>
- rebuild with new gcc and binutils

* Tue Apr 10 2001 Phil Knirsch <pknirsch at redhat.de>
- Fix for s390 patch to actually work

* Tue Mar 20 2001 Preston Brown <pbrown at redhat.com>
- fix up .desktop entry

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- fix typo

* Sun Feb 11 2001 Florian La Roche <Florian.LaRoche at redhat.de>
- adjusted s390 patches

* Wed Jan 31 2001 Preston Brown <pbrown at redhat.com>
- upgrade to 1.7.3, fixes (#11380)

* Mon Jan 15 2001 Than Ngo <than at redhat.com>
- ported to ibm s/390

* Tue Jul 25 2000 Jeff Johnson <jbj at redhat.com>
- migrate wmconfig to applnk.

* Fri Jul 14 2000 Jeff Johnson <jbj at redhat.com>
- rebuild the auto-rebuild.
- exclude alpha and i164 for now.

* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild

* Tue Jul  2 2000 Jakub Jelinek <jakub at redhat.com>
- Rebuild with new C++

* Fri Jun  2 2000 Jeff Johnson <jbj at redhat.com>
- rebuild for 7.0

* Mon Feb 14 2000 Matt Wilson <msw at redhat.com>
- rebuild on i386

* Mon Feb  7 2000 Jeff Johnson <jbj at redhat.com>
- compress man pages.

* Sun Mar 21 1999 Cristian Gafton <gafton at redhat.com> 
- auto rebuild in the new build environment (release 2)

* Mon Mar  8 1999 Jeff Johnson <jbj at redhat.com>
- updated to 1.7.1.

* Wed Mar  3 1999 Matt Wilson <msw at redhat.com>
- updated to 1.7.0

* Fri Feb  5 1999 Bill Nottingham <notting at redhat.com>
- build against new libstdc++, build on arm

* Tue Dec 22 1998 Jeff Johnson <jbj at redhat.com>
- update to 1.6.2.a.

* Tue Jun 16 1998 Jeff Johnson <jbj at redhat.com>
- add sparc/alpha functionality.
- add %%clean

* Mon Jun 01 1998 Prospector System <bugs at redhat.com>
- translations modified for de

* Mon Jun 01 1998 Erik Troan <ewt at redhat.com>
- how the hell did this get setuid root?

* Thu May 07 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Wed Apr 29 1998 Cristian Gafton <gafton at redhat.com>
- upgraded to 1.5.1 (so that it compiles with egcs)
- buildroot

* Tue Nov  4 1997 Erik Troan <ewt at redhat.com>
- commented out line causing core dumps when exiting

* Fri Oct 24 1997 Marc Ewing <marc at redhat.com>
- wmconfig

* Fri Aug 22 1997 Erik Troan <ewt at redhat.com>
- built against glibc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-9/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Sep 2008 01:05:28 -0000	1.1
+++ .cvsignore	11 Sep 2008 17:40:46 -0000	1.2
@@ -0,0 +1 @@
+xosview-1.8.3-20080301.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xosview/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Sep 2008 01:05:28 -0000	1.1
+++ sources	11 Sep 2008 17:40:46 -0000	1.2
@@ -0,0 +1 @@
+25cf811c5ca77c37baeac6e516a58a66  xosview-1.8.3-20080301.tar.gz