* xosview: new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5946 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xosview/xosview-vl.spec

@@ -6,31 +6,30 @@
 Summary: An X Window System utility for monitoring system resources.
 Summary(ja): X Window System のシステムリソースモニタ
 Name: xosview
-Version: 1.8.3
+Version: 1.9.2
 Release: 1%{?_dist_release}
-Exclusiveos: Linux
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-URL: http://xosview.sourceforge.net/
-Source1: xosview.png
-Patch0: xosview-non-i386.patch
-Patch1: xosview-io_h.patch
-Patch2: xosview-ppc.patch
-Patch3: xosview-rpath.patch
-Patch5: xosview-1.7.1-s390.patch
-Patch6: xosview-1.8.0-proc.patch
-Patch7: xosview-1.7.3-gcc3.patch
-Patch8: xosview-1.8.0-procstat.patch
-Patch9: xosview-1.8.0-strip.patch
-License: GPL/BSD
+URL:           http://www.pogo.org.uk/~mark/xosview/
+Source0:       http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.2.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
 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+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 # XXX ia64 needs porting work
 ExcludeArch: alpha ia64 sparc
 
 BuildRequires: libX11-devel
+BuildRequires: libXpm-devel
 %if %{desktop_file}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
+Requires: xorg-x11-fonts-misc
 
 %description
 The xosview utility displays a set of bar graphs which show the
@@ -45,75 +44,59 @@ xosview は，メモリ・CPU の使用率やシステム負荷など，現在
 
 %prep
 %setup -q
-#%patch0 -p0
-#%patch1 -p0
-#%patch2 -p1 -b .ppc
-#%patch3 -p0
-#%patch5 -p1 -b .s390
-#%patch6 -p1 -b .proc
-#%patch7 -p1 -b .gcc3
-#%patch8 -p1 -b .procstat
-#%patch9 -p1 -b .strip
-
-# --- XXX Cruft Alert!
-rm -f linux/*.o
+%patch0 -p1
 
-%build
-export CXX=g++
-%{__cp} /usr/share/libtool/config.* config/
-CXXFLAGS="$RPM_OPT_FLAGS -Wno-deprecated -DHAVE_SNPRINTF" %configure --disable-linux-memstat
-
-make all
-
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1,%{_datadir}/X11/app-defaults} \
-         %{buildroot}%{_datadir}/icons
-
-make install PREFIX_TO_USE=$RPM_BUILD_ROOT%{_prefix} \
-     XAPPLOADDIR=$RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons
 
-chmod u-s %{buildroot}%{_bindir}/*
+%build
+%configure
+%{__make} %{?_smp_mflags} all
 
-%if %{desktop_file}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications/
-desktop="%{buildroot}%{_datadir}/applications/xosview.desktop"
-%else
-mkdir -p %{buildroot}/etc/X11/applnk/Utilities
-desktop="%{buildroot}/etc/X11/applnk/Utilities/xosview.desktop"
-%endif
-cat > $desktop <<EOF
+cat > %{name}.desktop <<EOF
 [Desktop Entry]
 Encoding=UTF-8
-Categories=Application;System;
-name=xosview
-Comment=OS resource statistics Viewer
+Name=OS Resource Viewer
+Comment=
 Exec=xosview
 Terminal=false
 Type=Application
-Icon=/usr/share/icons/xosview.png
+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,0755)
-%doc README* TODO CHANGES
-%{_bindir}/xosview
-%{_mandir}/man1/*
+%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}/icons/*
-%if %{desktop_file}
-%{_datadir}/applications/*
-%else
-/etc/X11/applnk/Utilities/xosview.desktop
-%endif
+%{_datadir}/applications/%{name}.desktop
+
 
 %changelog
+* Thu Mar 22 2012 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.9.2-1
+- new upstream release; new upstream location
+- spec revamp based on Fedora
+
 * Thu Jun  5 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.8.3-1
 - rebuilt with xorg-x11 7.3
 - fixed installed location