From e52a2b50274fe8173a2495aa77a99756b0c3850a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 24 2018 19:48:18 +0000 Subject: pull in upstream fixes --- diff --git a/.gitignore b/.gitignore index 5029ed7..6f0ca81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /xdg-utils-1.1.3.tar.gz /xdg-utils-1.1.3.tar.gz.md5sum /xdg-utils-1.1.3.tar.gz.sha1sum +/0001-open-for-post-1.1.3-development.patch +/0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch diff --git a/sources b/sources index d368ca4..ce596b2 100644 --- a/sources +++ b/sources @@ -1,3 +1,5 @@ SHA512 (xdg-utils-1.1.3.tar.gz) = d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e SHA512 (xdg-utils-1.1.3.tar.gz.md5sum) = e467c3226563f800be9120a499181e91e5dc8ef1347140aceb9ac582bbf2ad2b54ecdcd6fef7dc3cec599333dfda02f830f17cb857d0fb91238a47f36399c3b1 SHA512 (xdg-utils-1.1.3.tar.gz.sha1sum) = bd5986c298c6496a2b21aa83a86d768473dd19b25070c04487000a2b5c3b29df5b3e967eab400db94f9a21444a334b97965e5555bcbbfaed48ab56280222c8a2 +SHA512 (0001-open-for-post-1.1.3-development.patch) = e1335d9d1ef13431eeb6945162bde6af4d5351af814a0e56d627a0e53e31e3d60d4466e59c3024e8c4badba127860d42ee43935ebdd4f6407de4e02fc70e5674 +SHA512 (0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch) = d7f36222e0ab32179ddb62e72576f9740f0bf829ec01f5b1c12c3f8206a16faeb2c7bff232d75d04aa91f80cf2478b36cc91e60f750791ad707f909df33f299b diff --git a/xdg-utils.spec b/xdg-utils.spec index d3e4140..6df3359 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -2,11 +2,11 @@ Summary: Basic desktop integration functions Name: xdg-utils Version: 1.1.3 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://portland.freedesktop.org/ %if 0%{?snap:1} -Source0: xdg-utils-1.1.0-%{snap}.tar.gz +Source0: xdg-utils-%{version}-%{snap}.tar.gz %else # at least until freedesktop folks move over to release dir Source0: https://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-%{version}.tar.gz @@ -16,6 +16,8 @@ Source1: xdg-utils-git_checkout.sh License: MIT ## upstream patches (treat as sources in lookaside cache) +Patch1: 0001-open-for-post-1.1.3-development.patch +Patch2: 0002-xdg-open-better-pcmanfm-check-BR106636-BR106161.patch # make sure BuildArch comes *after* patches, to ensure %%autosetup works right # http://bugzilla.redhat.com/1084309 @@ -90,6 +92,9 @@ make install DESTDIR=%{buildroot} %changelog +* Thu May 24 2018 Rex Dieter - 1.1.3-2 +- pull in upstream fixes + * Thu May 10 2018 Rex Dieter - 1.1.3-1 - xdg-utils-1.1.3