rpms/xdg-utils/F-12 .cvsignore, 1.14, 1.15 sources, 1.13, 1.14 xdg-utils.spec, 1.25, 1.26

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xdg-utils/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4206

Modified Files:
	.cvsignore sources xdg-utils.spec 
Log Message:
* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
- xdg-mime: line 531: kde-config: command not found (#545702)
- xdg-email calls gconftool which doesn't exist (#548529)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	16 Oct 2009 17:26:47 -0000	1.14
+++ .cvsignore	17 Dec 2009 19:18:25 -0000	1.15
@@ -1 +1 @@
-xdg-utils-20091016cvs.tgz
+xdg-utils-20091217cvs.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	16 Oct 2009 17:26:47 -0000	1.13
+++ sources	17 Dec 2009 19:18:25 -0000	1.14
@@ -1 +1 @@
-4a60deb7a09f57959b335e0d5acaf15c  xdg-utils-20091016cvs.tgz
+fa58fe2fe1bf638cb9a1b6b162746a87  xdg-utils-20091217cvs.tgz


Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-12/xdg-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- xdg-utils.spec	16 Oct 2009 17:26:47 -0000	1.25
+++ xdg-utils.spec	17 Dec 2009 19:18:25 -0000	1.26
@@ -1,10 +1,14 @@
 
-%define cvs 20091016cvs
+%if 0%{?fedora} > 12
+%define obsoletes_htmlview 1
+%endif
+
+%define cvs 20091217cvs
 
 Summary: Basic desktop integration functions 
 Name:    xdg-utils
 Version: 1.0.2
-Release: 14.%{cvs}%{?dist}
+Release: 16.%{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 th
 #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,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-16.20091217cvs
+- xdg-mime: line 531: kde-config: command not found (#545702)
+- xdg-email calls gconftool which doesn't exist (#548529)
+
+* Mon Nov 30 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-15.20091016cvs
+- add Obsoletes: htmlview (#541179, f13+)
+
 * Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-14.20091016cvs
 - prefer gvfs-open over gnome-open (#529287)
 - DE=gnome, if org.gnome.SessionManager exists on dbus (#529287)