[xosview] 1.12

[terjeros]

commit 9418aaae60519019416313d26c100d4319431d85
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Thu Dec 13 19:33:14 2012 +0100

    1.12
    
    - Add patch to install and read X resources

 .gitignore                 |    1 +
 sources                    |    2 +-
 xosview-1.11-app-def.patch |   81 ++++++++++++++++++++++++++++++++++++++++++++
 xosview.spec               |   10 +++++-
 4 files changed, 92 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 248743d..20972b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xosview-1.8.3-20080301.tar.gz
 /xosview-1.9.2.tar.gz
 /xosview-1.11.tar.gz
+/xosview-1.12.tar.gz
diff --git a/sources b/sources
index 5b5628a..60963c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e7fdc7941817f50726a177605cc26ad  xosview-1.11.tar.gz
+40745e5f2622d2459c734e0b8cfd209c  xosview-1.12.tar.gz
diff --git a/xosview-1.11-app-def.patch b/xosview-1.11-app-def.patch
new file mode 100644
index 0000000..6279c40
--- /dev/null
+++ b/xosview-1.11-app-def.patch
@@ -0,0 +1,81 @@
+diff --git a/Xdefaults b/Xdefaults
+index dbb8003..8faae8b 100644
+--- a/Xdefaults
++++ b/Xdefaults
+@@ -7,6 +7,8 @@
+ !xosview*display:
+ xosview*captions:           True
+ xosview*labels:             True
++! Transparency disabled in Debian builds - See bug #130633
++xosview*transparent:        False
+ xosview*meterLabelColor:    wheat
+ xosview*usedlabels:         True
+ xosview*usedLabelColor:     wheat
+@@ -15,8 +17,8 @@ xosview*font:               7x13bold
+ xosview*background:         navy
+ xosview*foreground:         wheat
+ xosview*enableStipple:	    False ! Change to true to try beta stipple support.
+-xosview*samplesPerSec:      10
+-xosview*graphNumCols:       135   ! number of samples shown in a graph
++xosview*samplesPerSec:      10    ! not yet supported
++xosview*graphNumCols:       128   ! number of samples shown in a graph
+ 
+ ! Load Meter Resources
+ ! We don't need to enable the Decay option, as it is already time-averaged.
+@@ -55,9 +57,10 @@ xosview*cpuFields:          USR SYS WIO IDLE
+ xosview*cpuUserColor:       seagreen
+ xosview*cpuNiceColor:       yellow
+ xosview*cpuSystemColor:     orange
+-xosview*cpuInterruptColor:  lightblue
++xosview*cpuInterruptColor:  red
+ xosview*cpuSInterruptColor: orange red
+-xosview*cpuWaitColor:       red
++xosview*cpuSoftIntColor:    red
++xosview*cpuWaitColor:       lightblue
+ xosview*cpuFreeColor:       aquamarine
+ xosview*cpuGuestColor:      blue
+ xosview*cpuNiceGuestColor:  gold
+@@ -75,10 +78,10 @@ xosview*mem:                True
+ xosview*memKernelColor:     yellow
+ xosview*memUsedColor:       seagreen
+ xosview*memSharedColor:     SkyBlue
+-xosview*memBufferColor:     red
++xosview*memBufferColor:     orange
+ xosview*memSlabColor:	    blue
+ xosview*memMapColor:	    SlateBlue1
+-xosview*memCacheColor:      orange
++xosview*memCacheColor:      red
+ xosview*memFreeColor:       aquamarine
+ xosview*memTextColor:       blue
+ xosview*memOtherColor:      orange
+@@ -165,7 +168,7 @@ xosview*intPriority:	    1
+ ! Interrupt Rate Meter Resources
+ xosview*irqrate:	True
+ xosview*irqrateUsedColor:	red
+-xosview*irqrateIdleColor:	aquamarine
++xosview*irqrateIdleColor:	black
+ xosview*irqratePriority:	1
+ xosview*irqrateUsedFormat:  autoscale
+ xosview*irqrateDecay:	True
+@@ -178,7 +181,7 @@ xosview*batteryLeftColor:   orange
+ xosview*batteryUsedColor:   aquamarine
+ xosview*batteryPriority:    50
+ xosview*batteryUsedFormat:  percent
+-xosview*batteryChargeColor: seagreen
++xosview*batteryChargeColor: green
+ xosview*batteryFullColor:   magenta
+ xosview*batteryLowColor:    red
+ xosview*batteryCritColor:   red
+diff --git a/Xrm.cc b/Xrm.cc
+index 04c5c08..6029e72 100644
+--- a/Xrm.cc
++++ b/Xrm.cc
+@@ -146,7 +146,7 @@ Listed from weakest to strongest:
+     XrmQuarkToString(_class));
+   if (result >= 0 && result < rlen)
+     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 < rlen)
+     XrmCombineFileDatabase (rfilename, &_db, 1);
diff --git a/xosview.spec b/xosview.spec
index 1ba6a65..5141c70 100644
--- a/xosview.spec
+++ b/xosview.spec
@@ -1,6 +1,6 @@
 Summary:       An X Window System utility for monitoring system resources
 Name:          xosview
-Version:       1.11
+Version:       1.12
 Release:       1%{?dist}
 Group:         Applications/System
 # The netbsd/swapinternal.{cc,h} source files are BSD only (with 
@@ -13,6 +13,7 @@ URL:           http://www.pogo.org.uk/~mark/xosview/
 Source0:       http://www.pogo.org.uk/~mark/xosview/releases/xosview-%{version}.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.11-app-def.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXpm-devel
 BuildRequires: libX11-devel 
@@ -26,6 +27,7 @@ etc. Xosview runs under the X Window System.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" 
@@ -50,6 +52,7 @@ EOF
 
 %{__make} install PREFIX=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
 %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
+%{__install} -p -m 0644 -D Xdefaults %{buildroot}%{_datadir}/X11/app-defaults/XOsview
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 
 %clean
@@ -62,8 +65,13 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/icons/%{name}.png
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/X11/app-defaults/XOsview
 
 %changelog
+* Thu Dec 13 2012 Terje Rosten <terje.rosten at ntnu.no> - 1.12-1
+- 1.12
+- Add patch to install and read X resources
+
 * Mon Dec 03 2012 Terje Rosten <terje.rosten at ntnu.no> - 1.11-1
 - 1.11