fix gnome-screensaver detection bogosity (#702540,#736159)
xdg-open: x-www-browser: command not found (#755553) drop htmlview hackage
This commit is contained in:
parent
b1c82a5f18
commit
6084d211b6
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
/xdg-utils-1.1.0-20110510.tar.gz
|
||||
/xdg-utils-1.1.0-20110714.tar.gz
|
||||
/xdg-utils-1.1.0-20111207git.tar.gz
|
||||
|
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ $# -gt 0 ]; then
|
||||
exec /usr/bin/xdg-open "$@"
|
||||
else
|
||||
exec /usr/bin/xdg-open http://start.fedoraproject.org/
|
||||
fi
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
fa24446f0417c2c92ce8fcd69130fe25 xdg-utils-1.1.0-20110714.tar.gz
|
||||
ac5ed7a833ec2cf6b731da8af0771d6b xdg-utils-1.1.0-20111207git.tar.gz
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
MODULE=xdg-utils
|
||||
VERSION=1.1.0
|
||||
DATE=$(date +%Y%m%d)
|
||||
DATE=$(date +%Y%m%d)git
|
||||
|
||||
set -x
|
||||
|
||||
|
@ -1,19 +1,15 @@
|
||||
|
||||
%if 0%{?fedora} > 12 && 0%{?fedora} < 15
|
||||
%define htmlview 1
|
||||
%endif
|
||||
|
||||
%define snap 20110714
|
||||
%define snap 20111207
|
||||
#define pre rc1
|
||||
|
||||
Summary: Basic desktop integration functions
|
||||
Name: xdg-utils
|
||||
Version: 1.1.0
|
||||
Release: 0.9.%{snap}%{?dist}
|
||||
Release: 0.10.%{snap}%{?dist}
|
||||
|
||||
URL: http://portland.freedesktop.org/
|
||||
%if 0%{?snap:1}
|
||||
Source0: xdg-utils-%{version}-%{snap}.tar.gz
|
||||
Source0: xdg-utils-%{version}-%{snap}git.tar.gz
|
||||
Source1: xdg-utils-git_checkout.sh
|
||||
%else
|
||||
Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz
|
||||
@ -23,8 +19,6 @@ Group: System Environment/Base
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildArch: noarch
|
||||
|
||||
Source10: htmlview.sh
|
||||
|
||||
%if 0%{?snap}
|
||||
BuildRequires: gawk
|
||||
BuildRequires: xmlto
|
||||
@ -34,11 +28,8 @@ Requires: coreutils
|
||||
Requires: desktop-file-utils
|
||||
Requires: which
|
||||
|
||||
# drop for f16+
|
||||
%if 0%{?fedora} && 0%{?fedora} < 16
|
||||
Obsoletes: htmlview <= 4.0.0
|
||||
## nothing should be depending on this
|
||||
%if 0%{?htmlview}
|
||||
Provides: htmlview = 4.0.1
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -83,17 +74,10 @@ rm -rf %{buildroot}
|
||||
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
%if 0%{?htmlview}
|
||||
install -m755 -p %{SOURCE10} %{buildroot}%{_bindir}/htmlview
|
||||
%endif
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc ChangeLog LICENSE README TODO
|
||||
%if 0%{?htmlview}
|
||||
%{_bindir}/htmlview
|
||||
%endif
|
||||
%{_bindir}/xdg-desktop-icon
|
||||
%{_bindir}/xdg-desktop-menu
|
||||
%{_bindir}/xdg-email
|
||||
@ -117,6 +101,11 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Dec 07 2011 Rex Dieter <rdieter@fedoraproject.org> 1.1.0-0.10.20110714git
|
||||
- fix gnome-screensaver detection bogosity (#702540,#736159)
|
||||
- xdg-open: x-www-browser: command not found (#755553)
|
||||
- drop htmlview hackage
|
||||
|
||||
* Thu Jul 14 2011 Rex Dieter <rdieter@fedoraproject.org> 1.1.0-0.9.20110714
|
||||
- 20110714 snapshot
|
||||
- xdg-mime : use 'file --mime-type' instead of 'file -i'
|
||||
|
Loading…
Reference in New Issue
Block a user