- add Obsoletes: htmlview (#541179, f13+)

htmlview.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ $# -gt 0 ]; then
+ exec /usr/bin/xdg-open "$@"
+else
+ exec /usr/bin/xdg-open http://start.fedoraproject.org/
+fi
+

xdg-utils.spec

@@ -1,10 +1,14 @@
 
+%if 0%{?fedora} > 12
+%define obsoletes_htmlview 1
+%endif
+
 %define cvs 20091016cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 14.%{cvs}%{?dist}
+Release: 15.%{cvs}%{?dist}
 
 URL:     http://portland.freedesktop.org/ 
 %if 0%{?cvs:1}
@@ -18,6 +22,8 @@ Group:   System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
+Source10: htmlview.sh
+
 Patch1: xdg-utils-1.0.2-htmlview.patch
 
 ## upstreamable patches
@@ -44,6 +50,11 @@ Requires: desktop-file-utils
 #Requires(hint): perl-File-MimeInfo 
 Requires: which
 
+%if 0%{?obsoletes_htmlview}
+Obsoletes: htmlview <= 4.0.0
+## nothing should be depending on this 
+#Provides:  htmlview = 4.0.1
+%endif
 
 %description
 The %{name} package is a set of simple scripts that provide basic
@@ -71,7 +82,9 @@ The following scripts are provided at this time:
 #setup -q -n %{name}-%{version}%{?beta}
 %setup -q -n %{name}
 
+%if ! 0%{?obsoletes_htmlview}
 %patch1 -p1 -b .htmlview
+%endif
 #patch50 -p1 -b .CVE-2009-0068-1
 
 %if ! 0%{?cvs:1}
@@ -93,10 +106,17 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+%if 0%{?obsoletes_htmlview}
+install -m755 -p %{SOURCE10} %{buildroot}%{_bindir}/htmlview
+%endif
+
 
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog LICENSE README TODO
+%if 0%{?obsoletes_htmlview}
+%{_bindir}/htmlview
+%endif
 %{_bindir}/xdg-*
 %{_mandir}/man1/xdg-*
 
@@ -106,6 +126,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 30 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-15.20091016cvs
+- add Obsoletes: htmlview (#541179, f13+)
+
 * Fri Oct 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-14.20091016cvs
 - prefer gvfs-open over gnome-open (#529287)
 - DE=gnome, if org.gnome.SessionManager exists on dbus (#529287)