From 5df263259d9c18fe1f7130ff71db9f57aacdaaac Mon Sep 17 00:00:00 2001
From: Terje R�sten <terje.rosten@ntnu.no>
Date: Dec 03 2012 12:11:39 +0000
Subject: 1.11


---

diff --git a/.gitignore b/.gitignore
index 5f6f8ec..248743d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xosview-1.8.3-20080301.tar.gz
 /xosview-1.9.2.tar.gz
+/xosview-1.11.tar.gz
diff --git a/sources b/sources
index fff6a20..5b5628a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f405f98bdbf1d2b68133bec7b38db4bd  xosview-1.9.2.tar.gz
+2e7fdc7941817f50726a177605cc26ad  xosview-1.11.tar.gz
diff --git a/xosview-1.9.2-appdef.patch b/xosview-1.9.2-appdef.patch
deleted file mode 100644
index 94b1848..0000000
--- a/xosview-1.9.2-appdef.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/config/Makefile.top.in b/config/Makefile.top.in
-index 8c1dcb5..837cce6 100644
---- a/config/Makefile.top.in
-+++ b/config/Makefile.top.in
-@@ -47,7 +47,7 @@ xosview: $(OBJS) @top_srcdir@/@host_dir@/libmeter.a
- 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 --git a/Xrm.cc b/Xrm.cc
-index 0a45b1e..1017dbd 100644
---- a/Xrm.cc
-+++ b/Xrm.cc
-@@ -147,7 +147,7 @@ Listed from weakest to strongest:
-     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 < sizeof rfilename)
-     XrmCombineFileDatabase (rfilename, &_db, 1);
diff --git a/xosview.spec b/xosview.spec
index 335bd93..1ba6a65 100644
--- a/xosview.spec
+++ b/xosview.spec
@@ -1,7 +1,7 @@
 Summary:       An X Window System utility for monitoring system resources
 Name:          xosview
-Version:       1.9.2
-Release:       4%{?dist}
+Version:       1.11
+Release:       1%{?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 
@@ -10,10 +10,9 @@ Group:         Applications/System
 # based, or can fall under either the BSD or GPL copyright.
 License:       GPL+
 URL:           http://www.pogo.org.uk/~mark/xosview/
-Source0:       http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.2.tar.gz
+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.9.2-appdef.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXpm-devel
 BuildRequires: libX11-devel 
@@ -27,13 +26,9 @@ etc. Xosview runs under the X Window System.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-cp -f /usr/lib/rpm/config.* config/
-%configure
-%{__make} %{?_smp_mflags} all
-
+%{__make} %{?_smp_mflags} OPTFLAGS="%{optflags}" 
 cat > %{name}.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
@@ -51,10 +46,9 @@ EOF
 %{__install} -d %{buildroot}%{_bindir}   \
     %{buildroot}%{_mandir}/man1          \
     %{buildroot}%{_datadir}/icons        \
-    %{buildroot}%{_datadir}/applications \
-    %{buildroot}%{_datadir}/X11/app-defaults
+    %{buildroot}%{_datadir}/applications
 
-%{__make} install PREFIX_TO_USE=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
+%{__make} install PREFIX=%{buildroot}%{_prefix} INSTALL="%{__install} -p"
 %{__install} -p -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/%{name}.png
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 
@@ -63,14 +57,16 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGES COPYING COPYING.GPL README README.linux TODO
+%doc CHANGES COPYING COPYING.GPL README README.linux TODO Xdefaults
 %{_bindir}/%{name}
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/icons/%{name}.png
-%{_datadir}/X11/app-defaults/XOsview
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
+* Mon Dec 03 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.11-1
+- 1.11
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild