[xdg-utils] - xdg-utils-1.1.0-rc1
Rex Dieter
rdieter at fedoraproject.org
Tue Jan 4 12:28:02 UTC 2011
commit 50cab9656e511227881ac51ec3d1169b91ffc5ed
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Jan 4 06:27:29 2011 -0600
- xdg-utils-1.1.0-rc1
.gitignore | 1 +
sources | 2 +-
xdg-utils-cvs_checkout.sh | 17 -----------
xdg-utils-git_checkout.sh | 17 +++++++++++
xdg-utils-htmlview.patch | 12 --------
xdg-utils.spec | 67 +++++++++++++++++++++++++++++----------------
6 files changed, 62 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4714bbc..cb8dbd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/xdg-utils-20101028.tgz
+/xdg-utils-1.1.0-rc1.tar.gz
diff --git a/sources b/sources
index 17ed2c3..c978c88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8c7b2581c420b534a1d6692ef49ca1aa xdg-utils-20101028.tgz
+fadf5e7a08e0526fc60dbe3e5b7ef8d6 xdg-utils-1.1.0-rc1.tar.gz
diff --git a/xdg-utils-git_checkout.sh b/xdg-utils-git_checkout.sh
new file mode 100755
index 0000000..3eeedc0
--- /dev/null
+++ b/xdg-utils-git_checkout.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+
+MODULE=xdg-utils
+VERSION=1.1.0
+DATE=$(date +%Y%m%d)
+
+set -x
+
+rm -rf $MODULE
+
+git clone git://anongit.freedesktop.org/portland/xdg-utils $MODULE/
+pushd $MODULE
+git archive master --format tar --prefix=${MODULE}-${VERSION}/ | gzip -9 > ../${MODULE}-${VERSION}-${DATE}.tar.gz
+popd
+
+rm -rf $MODULE
diff --git a/xdg-utils.spec b/xdg-utils.spec
index b8dbae9..05231e2 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -1,21 +1,22 @@
-%if 0%{?fedora} > 12
-%define obsoletes_htmlview 1
+%if 0%{?fedora} > 12 && 0%{?fedora} < 15
+%define htmlview 1
%endif
-%define cvs 20101028
+#define snap 20101028
+%define pre rc1
Summary: Basic desktop integration functions
Name: xdg-utils
-Version: 1.0.2
-Release: 21.%{cvs}%{?dist}
+Version: 1.1.0
+Release: 0.1.%{pre}%{?dist}
URL: http://portland.freedesktop.org/
%if 0%{?cvs:1}
-Source0: xdg-utils-%{cvs}.tgz
-Source1: xdg-utils-cvs_checkout.sh
+Source0: xdg-utils-%{version}-%{snap}.tgz
+Source1: xdg-utils-git_checkout.sh
%else
-Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?beta}.tgz
+Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?pre:-%{pre}}.tar.gz
%endif
License: MIT
Group: System Environment/Base
@@ -24,10 +25,10 @@ BuildArch: noarch
Source10: htmlview.sh
-Patch1: xdg-utils-htmlview.patch
-
+%if 0%{?snap}
BuildRequires: gawk
BuildRequires: xmlto
+%endif
Requires: coreutils
Requires: desktop-file-utils
@@ -35,17 +36,16 @@ Requires: desktop-file-utils
#Requires(hint): kdelibs
## update-gtk-icon-cache
#Requires(hint): gtk2
-## htmlview patch
-#Requires(hint): htmlview links
## mimeopen generic default
#Requires(hint): %{_bindir}/mimeopen
#Requires(hint): perl-File-MimeInfo
Requires: which
-%if 0%{?obsoletes_htmlview}
+# drop for f16+
Obsoletes: htmlview <= 4.0.0
## nothing should be depending on this
-#Provides: htmlview = 4.0.1
+%if 0%{?htmlview}
+Provides: htmlview = 4.0.1
%endif
%description
@@ -60,22 +60,22 @@ This means that:
* Distribution vendors can provide custom versions of these utilities
The following scripts are provided at this time:
-* xdg-desktop-menu Install desktop menu items
* xdg-desktop-icon Install icons to the desktop
+* xdg-desktop-menu Install desktop menu items
+* xdg-email Send mail using the user's preferred e-mail composer
* xdg-icon-resource Install icon resources
* xdg-mime Query information about file type handling and
install descriptions for new file types
* xdg-open Open a file or URL in the user's preferred application
-* xdg-email Send mail using the user's preferred e-mail composer
* xdg-screensaver Control the screensaver
+* xdg-settings Get various settings from the desktop environment
%prep
-#setup -q -n %{name}-%{version}%{?beta}
+%if 0%{?cvs:1}
%setup -q -n %{name}
-
-%if ! 0%{?obsoletes_htmlview}
-%patch1 -p1 -b .htmlview
+%else
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
%endif
@@ -83,7 +83,9 @@ The following scripts are provided at this time:
%configure
make %{?_smp_mflags}
+%if 0%{?cvs:1}
make -C scripts scripts
+%endif
%install
@@ -91,7 +93,7 @@ rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-%if 0%{?obsoletes_htmlview}
+%if 0%{?htmlview}
install -m755 -p %{SOURCE10} %{buildroot}%{_bindir}/htmlview
%endif
@@ -99,11 +101,25 @@ install -m755 -p %{SOURCE10} %{buildroot}%{_bindir}/htmlview
%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE README TODO
-%if 0%{?obsoletes_htmlview}
+%if 0%{?htmlview}
%{_bindir}/htmlview
%endif
-%{_bindir}/xdg-*
-%{_mandir}/man1/xdg-*
+%{_bindir}/xdg-desktop-icon
+%{_bindir}/xdg-desktop-menu
+%{_bindir}/xdg-email
+%{_bindir}/xdg-icon-resource
+%{_bindir}/xdg-mime
+%{_bindir}/xdg-open
+%{_bindir}/xdg-screensaver
+%{_bindir}/xdg-settings
+%{_mandir}/man1/xdg-desktop-icon.1*
+%{_mandir}/man1/xdg-desktop-menu.1*
+%{_mandir}/man1/xdg-email.1*
+%{_mandir}/man1/xdg-icon-resource.1*
+%{_mandir}/man1/xdg-mime.1*
+%{_mandir}/man1/xdg-open.1*
+%{_mandir}/man1/xdg-screensaver.1*
+%{_mandir}/man1/xdg-settings.1*
%clean
@@ -111,6 +127,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jan 03 2011 Rex Dieter <rdieter at fedoraproject.org> - 1.1.0-0.1.rc1
+- xdg-utils-1.1.0-rc1
+
* Thu Oct 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0.2-21.20101028
- lxde support (#580835, fdo#26058))
More information about the scm-commits
mailing list