rpms/xdg-utils/F-11 htmlview.sh, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.10, 1.11 xdg-utils.spec, 1.21, 1.22
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 17 19:27:18 UTC 2009
- Previous message (by thread): rpms/perl-PDF-Create/devel LICENSE, NONE, 1.1 perl-PDF-Create.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-PDF-Create/F-12 LICENSE, NONE, 1.1 perl-PDF-Create.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/xdg-utils/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6045
Modified Files:
.cvsignore sources xdg-utils.spec
Added Files:
htmlview.sh
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)
--- NEW FILE htmlview.sh ---
#!/bin/sh
if [ $# -gt 0 ]; then
exec /usr/bin/xdg-open "$@"
else
exec /usr/bin/xdg-open http://start.fedoraproject.org/
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-11/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore 12 Nov 2009 15:53:52 -0000 1.11
+++ .cvsignore 17 Dec 2009 19:27:17 -0000 1.12
@@ -1 +1 @@
-xdg-utils-20091016cvs.tgz
+xdg-utils-20091217cvs.tgz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 12 Nov 2009 15:53:52 -0000 1.10
+++ sources 17 Dec 2009 19:27:18 -0000 1.11
@@ -1 +1 @@
-4a60deb7a09f57959b335e0d5acaf15c xdg-utils-20091016cvs.tgz
+fa58fe2fe1bf638cb9a1b6b162746a87 xdg-utils-20091217cvs.tgz
Index: xdg-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xdg-utils/F-11/xdg-utils.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xdg-utils.spec 12 Nov 2009 15:53:52 -0000 1.21
+++ xdg-utils.spec 17 Dec 2009 19:27:18 -0000 1.22
@@ -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)
- Previous message (by thread): rpms/perl-PDF-Create/devel LICENSE, NONE, 1.1 perl-PDF-Create.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/perl-PDF-Create/F-12 LICENSE, NONE, 1.1 perl-PDF-Create.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list