From 4e54673029c2555652e573b1ff8c5ec69b730b69 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 27 Feb 2018 16:03:45 -0600 Subject: [PATCH] pull in upstream fixes --- .gitignore | 8 ++++++++ sources | 8 ++++++++ xdg-utils.spec | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 471e588..0d0f97c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,9 @@ /xdg-utils-1.1.2.tar.gz +/0001-bump-version-1.1.2.patch +/0002-init-1.1.3-ChangeLog-section.patch +/0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch +/0004-xdg-mime.1-Add-missing-period.patch +/0005-Spelling-fixes-BR103255.patch +/0006-xdg-mime-awk-script-syntax-error-BR104298.patch +/0007-xdg-open-Fixes-LXQt-behavior.patch +/0008-Changelog-for-prior-commit.patch diff --git a/sources b/sources index 7e68d49..764965d 100644 --- a/sources +++ b/sources @@ -1 +1,9 @@ SHA512 (xdg-utils-1.1.2.tar.gz) = 1927506065788b5f8bba8b0617a8ee585265342fa40c4b73000d320acd5909036daef94d49495b00982dbb67b7706b2f1ed949cb4cc519dfa534be2c1c8f74db +SHA512 (0001-bump-version-1.1.2.patch) = 9e5d94ee6a6b28ebbf385d20fe3bd05f0e3505060f177bc842ca4b2367c998dc0385b1902cfab767044dbcf8be7561e224d55eb79d7b016f1ffa1c08a113fd01 +SHA512 (0002-init-1.1.3-ChangeLog-section.patch) = 49a21f5d8e2fc0143841c7aa6de6144ae889463c7907c2064e24d4fbbb91d7ca3f86884a63388b2dddc98ddc19b3055751113a8129d63fba9cf4769798246838 +SHA512 (0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch) = 44fcf20fe1ac3f0e5a9fc9131d75cbed628d5fad40ca2a2291e602aad95ae1c0930a33cdee6c38f9d32c8dd94cf7c2eee06f8659e62d6575b47ad522b179b60c +SHA512 (0004-xdg-mime.1-Add-missing-period.patch) = e3a2fbc490dd627a4971cfd9667d9afaccd60898632276e48c07979c417b7aaa7a692a6a1160041f0d3e533e97aa9254de435b05708435045a3e90d90945a9d1 +SHA512 (0005-Spelling-fixes-BR103255.patch) = 332ecb4cd6980b7848516a9f93afc22fd672bba4d804a74980ef8c2816bdca3a74a18488d853dcca1d25e375f10472d831ed8d518a1847f0c57241a7a0f9e0a3 +SHA512 (0006-xdg-mime-awk-script-syntax-error-BR104298.patch) = 76bc6153b5487d20bd8a0b399e937ce69c5120fbe8d0d98ea25c1ad5afa48bbd59af2f199928babeecdf66c71cb761b884a2ac14e1090d8372e8a14c4fb52232 +SHA512 (0007-xdg-open-Fixes-LXQt-behavior.patch) = 790c28c8c45d3574f54f8f21a0b76620de7ea0d47666efa0b26f9be131b31c3e0b0a7f45dbb8c6c482bb7f42a5a89c10867037810c61189097f43be3904cdaf0 +SHA512 (0008-Changelog-for-prior-commit.patch) = c13befcb948b0d7c6e8b953eb5667e005e0ea408f8822ef74eac71571e0dc7ac1e1fc102dc43ce04c36c30be2dd4169ff907330428baef045ca87a3a07087928 diff --git a/xdg-utils.spec b/xdg-utils.spec index b0f3d60..a24d5bb 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,11 +1,10 @@ - #global prerelease rc3 #global snap 20150927git Summary: Basic desktop integration functions Name: xdg-utils Version: 1.1.2 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://portland.freedesktop.org/ %if 0%{?snap:1} @@ -19,6 +18,14 @@ Source1: xdg-utils-git_checkout.sh License: MIT ## upstream patches (treat as sources in lookaside cache) +Patch1: 0001-bump-version-1.1.2.patch +Patch2: 0002-init-1.1.3-ChangeLog-section.patch +Patch3: 0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch +Patch4: 0004-xdg-mime.1-Add-missing-period.patch +Patch5: 0005-Spelling-fixes-BR103255.patch +Patch6: 0006-xdg-mime-awk-script-syntax-error-BR104298.patch +Patch7: 0007-xdg-open-Fixes-LXQt-behavior.patch +Patch8: 0008-Changelog-for-prior-commit.patch # make sure BuildArch comes *after* patches, to ensure %%autosetup works right # http://bugzilla.redhat.com/1084309 @@ -93,6 +100,9 @@ make install DESTDIR=%{buildroot} %changelog +* Tue Feb 27 2018 Rex Dieter - 1.1.2-4 +- pull in upstream fixes + * Fri Feb 09 2018 Fedora Release Engineering - 1.1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild