From cc9be002a24d7b92c313c343353034d6fa9c9f9f6cf10d0198345a460d70c9a0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 15 Jan 2018 22:40:03 +0000 Subject: [PATCH 01/14] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=558 --- 0001-Improve-XDG-Menu-checks-stability.patch | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/0001-Improve-XDG-Menu-checks-stability.patch b/0001-Improve-XDG-Menu-checks-stability.patch index 3a71517..d1d418f 100644 --- a/0001-Improve-XDG-Menu-checks-stability.patch +++ b/0001-Improve-XDG-Menu-checks-stability.patch @@ -1,4 +1,4 @@ -From e6594808fdf6c1fcb4175c523582ab7c358839f0 Mon Sep 17 00:00:00 2001 +From 8de78fa8b0cd9a2fe4156b841429ac8d55b39909 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 29 Sep 2017 09:12:33 +0200 Subject: [PATCH] Improve XDG Menu checks stability @@ -14,17 +14,17 @@ rpmlint errors. Also separate the code a little and cleaning it up. create mode 100644 test/binary/menuxdg1-0-0.noarch.rpm create mode 100644 test/test_menuxdg.py -Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py -=================================================================== ---- rpmlint-rpmlint-1.10.orig/MenuXDGCheck.py -+++ rpmlint-rpmlint-1.10/MenuXDGCheck.py +diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py +index 9995255..66912ea 100644 +--- a/MenuXDGCheck.py ++++ b/MenuXDGCheck.py @@ -8,15 +8,15 @@ import os try: - from ConfigParser import RawConfigParser + import ConfigParser as cfgparser - except: + except ImportError: - from configparser import RawConfigParser + import configparser as cfgparser @@ -37,14 +37,17 @@ Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): -@@ -27,6 +27,51 @@ class MenuXDGCheck(AbstractCheck.Abstrac +@@ -25,7 +25,52 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): + # $ echo $XDG_DATA_DIRS/applications + # /var/lib/menu-xdg:/usr/share AbstractCheck.AbstractFilesCheck.__init__( - self, "MenuXDGCheck", r"(?:/usr/share|/etc/opt/.*/share|/opt/.*)/applications/.*\.desktop$") - +- self, "MenuXDGCheck", r"/usr/share/applications/.*\.desktop$") ++ self, "MenuXDGCheck", r'(?:/usr|/etc/opt|/opt/.*)/share/applications/.*\.desktop$') ++ + def parse_desktop_file(self, pkg, root, f, filename): + cfp = cfgparser.RawConfigParser() + try: -+ with open(f) as inputf: ++ with open(f, 'rb') as inputf: + cfp.readfp(inputf, filename) + except cfgparser.DuplicateSectionError as e: + printError( @@ -85,11 +88,10 @@ Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py + if not found: + printWarning( + pkg, 'desktopfile-without-binary', filename, binary) -+ + def check_file(self, pkg, filename): root = pkg.dirName() - f = root + filename -@@ -43,25 +88,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac +@@ -43,25 +88,7 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): if not is_utf8(f): printError(pkg, 'non-utf8-desktopfile', filename) From f56c6d624f74f1cb20e91e4185bd216d8a7b01e0935c31c3f7157ee41f5ff387 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jan 2018 11:05:26 +0000 Subject: [PATCH 02/14] - refresh for 0001-Improve-XDG-Menu-checks-stability.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=560 --- rpmlint.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rpmlint.changes b/rpmlint.changes index d48e0d5..445f357 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 23 11:05:10 UTC 2018 - dmueller@suse.com + +- refresh for 0001-Improve-XDG-Menu-checks-stability.patch + ------------------------------------------------------------------- Mon Jan 15 09:15:19 UTC 2018 - krahmer@suse.com From f6b96843808eb803407357bdcdf25ea0c38ac51bc6fcfce90fe4e0911b12e8f6 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jan 2018 11:16:55 +0000 Subject: [PATCH 03/14] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=561 --- 0001-Improve-XDG-Menu-checks-stability.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/0001-Improve-XDG-Menu-checks-stability.patch b/0001-Improve-XDG-Menu-checks-stability.patch index d1d418f..ba89dac 100644 --- a/0001-Improve-XDG-Menu-checks-stability.patch +++ b/0001-Improve-XDG-Menu-checks-stability.patch @@ -37,7 +37,7 @@ index 9995255..66912ea 100644 class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): -@@ -25,7 +25,52 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): +@@ -25,7 +25,52 @@ def __init__(self): # $ echo $XDG_DATA_DIRS/applications # /var/lib/menu-xdg:/usr/share AbstractCheck.AbstractFilesCheck.__init__( @@ -91,7 +91,7 @@ index 9995255..66912ea 100644 def check_file(self, pkg, filename): root = pkg.dirName() -@@ -43,25 +88,7 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): +@@ -43,25 +88,7 @@ def check_file(self, pkg, filename): if not is_utf8(f): printError(pkg, 'non-utf8-desktopfile', filename) @@ -118,7 +118,7 @@ index 9995255..66912ea 100644 check = MenuXDGCheck() -@@ -76,4 +103,15 @@ addDetails( +@@ -76,4 +103,15 @@ def check_file(self, pkg, filename): 'desktopfile-without-binary', '''the .desktop file is for a file not present in the package. You should check the requires or see if this is not a error''', From e66338ab6402b9adcfb3b6826ff0d428f8bfd28800747826183cc09eb4fddb08 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 23 Jan 2018 12:12:00 +0000 Subject: [PATCH 04/14] remove xdg-paths-update.diff (merged into other patch) OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=562 --- 0001-Improve-XDG-Menu-checks-stability.patch | 28 ++++++++------------ rpmlint.changes | 1 + rpmlint.spec | 1 - xdg-paths-update.diff | 22 --------------- 4 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 xdg-paths-update.diff diff --git a/0001-Improve-XDG-Menu-checks-stability.patch b/0001-Improve-XDG-Menu-checks-stability.patch index ba89dac..0067d52 100644 --- a/0001-Improve-XDG-Menu-checks-stability.patch +++ b/0001-Improve-XDG-Menu-checks-stability.patch @@ -14,30 +14,24 @@ rpmlint errors. Also separate the code a little and cleaning it up. create mode 100644 test/binary/menuxdg1-0-0.noarch.rpm create mode 100644 test/test_menuxdg.py -diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py -index 9995255..66912ea 100644 ---- a/MenuXDGCheck.py -+++ b/MenuXDGCheck.py -@@ -8,15 +8,15 @@ +Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py +=================================================================== +--- rpmlint-rpmlint-1.10.orig/MenuXDGCheck.py ++++ rpmlint-rpmlint-1.10/MenuXDGCheck.py +@@ -8,9 +8,9 @@ import os try: - from ConfigParser import RawConfigParser -+ import ConfigParser as cfgparser - except ImportError: +-except: - from configparser import RawConfigParser ++ import ConfigParser as cfgparser ++except ImportError: + import configparser as cfgparser import AbstractCheck from Filter import addDetails, printError, printWarning - from Pkg import getstatusoutput, is_utf8 - --STANDARD_BIN_DIRS = ['/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/'] -+STANDARD_BIN_DIRS = ('/bin', '/sbin', '/usr/bin', '/usr/sbin') - - - class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): -@@ -25,7 +25,52 @@ def __init__(self): +@@ -25,7 +25,52 @@ class MenuXDGCheck(AbstractCheck.Abstrac # $ echo $XDG_DATA_DIRS/applications # /var/lib/menu-xdg:/usr/share AbstractCheck.AbstractFilesCheck.__init__( @@ -91,7 +85,7 @@ index 9995255..66912ea 100644 def check_file(self, pkg, filename): root = pkg.dirName() -@@ -43,25 +88,7 @@ def check_file(self, pkg, filename): +@@ -43,25 +88,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac if not is_utf8(f): printError(pkg, 'non-utf8-desktopfile', filename) @@ -118,7 +112,7 @@ index 9995255..66912ea 100644 check = MenuXDGCheck() -@@ -76,4 +103,15 @@ def check_file(self, pkg, filename): +@@ -76,4 +103,15 @@ addDetails( 'desktopfile-without-binary', '''the .desktop file is for a file not present in the package. You should check the requires or see if this is not a error''', diff --git a/rpmlint.changes b/rpmlint.changes index 445f357..bf92bb3 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -2,6 +2,7 @@ Tue Jan 23 11:05:10 UTC 2018 - dmueller@suse.com - refresh for 0001-Improve-XDG-Menu-checks-stability.patch + remove xdg-paths-update.diff (merged into other patch) ------------------------------------------------------------------- Mon Jan 15 09:15:19 UTC 2018 - krahmer@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 33f8db4..f585fb6 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -46,7 +46,6 @@ Patch20: usr-arch.diff Patch23: suse-filter-more-verbose.diff Patch24: docdata-examples.diff Patch25: yast-provides.diff -Patch26: xdg-paths-update.diff Patch27: better-wrong-script.diff Patch28: buildroot-doc.diff Patch29: rpmgroup-checks.diff diff --git a/xdg-paths-update.diff b/xdg-paths-update.diff deleted file mode 100644 index 7886f3a..0000000 --- a/xdg-paths-update.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Some One -Date: Thu, 9 Apr 2015 14:55:38 +0200 -Subject: [PATCH] xdg-paths-update.diff - -=================================================================== ---- - MenuXDGCheck.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py -=================================================================== ---- rpmlint-rpmlint-1.10.orig/MenuXDGCheck.py -+++ rpmlint-rpmlint-1.10/MenuXDGCheck.py -@@ -25,7 +25,7 @@ class MenuXDGCheck(AbstractCheck.Abstrac - # $ echo $XDG_DATA_DIRS/applications - # /var/lib/menu-xdg:/usr/share - AbstractCheck.AbstractFilesCheck.__init__( -- self, "MenuXDGCheck", r"/usr/share/applications/.*\.desktop$") -+ self, "MenuXDGCheck", r"(?:/usr/share|/etc/opt/.*/share|/opt/.*)/applications/.*\.desktop$") - - def check_file(self, pkg, filename): - root = pkg.dirName() From 6d377a12587be6dc26310f842a58af56e3e3c85e432c7295b794e5513f741adc Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Feb 2018 13:51:40 +0000 Subject: [PATCH 05/14] - Update to version 84.87+git20180202.3df4ae7: * Add testcases for MenuXDGCheck.py - Update rpmlint-checks to version master: * Support uppercase tag macros used by RPM 4.14 - Update to version 84.87+git20180202.3df4ae7: * Add testcases for MenuXDGCheck.py OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=563 --- _servicedata | 4 ++-- rpmlint-checks-master.tar.xz | 4 ++-- rpmlint-tests-84.87+git20171011.8b163ac.tar.xz | 3 --- rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz | 3 +++ rpmlint-tests.changes | 6 ++++++ rpmlint-tests.spec | 2 +- rpmlint.changes | 12 ++++++++++++ 7 files changed, 26 insertions(+), 8 deletions(-) delete mode 100644 rpmlint-tests-84.87+git20171011.8b163ac.tar.xz create mode 100644 rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz diff --git a/_servicedata b/_servicedata index 5c1d8f3..9866355 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpmlint-tests.git - 8b163ac0aaf41e8424edbc4074a60f18e9cb9438 + 91f443ae38b0bf051ab99c40b69d92c505907d04 https://github.com/openSUSE/rpmlint-checks.git - 19a2516ec526f44b39a88e1757fc4f9fa1f3b603 \ No newline at end of file + 6825f95a1dd2825b86609427148576cfcacdbd1f \ No newline at end of file diff --git a/rpmlint-checks-master.tar.xz b/rpmlint-checks-master.tar.xz index 8abc535..2572b6e 100644 --- a/rpmlint-checks-master.tar.xz +++ b/rpmlint-checks-master.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:31ced77bac654f56787b2d941e7b821696c79116204ff5943e31f1bfa7956f40 -size 23176 +oid sha256:1d6b78c923ba6de0449e3675b4eee341e5b4522e2108d53c52b181193186708c +size 23196 diff --git a/rpmlint-tests-84.87+git20171011.8b163ac.tar.xz b/rpmlint-tests-84.87+git20171011.8b163ac.tar.xz deleted file mode 100644 index b07c921..0000000 --- a/rpmlint-tests-84.87+git20171011.8b163ac.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ae84f26459605339a1dfa6511573e8d4837902517dd4c52bcd159fbc7780de6 -size 10700 diff --git a/rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz b/rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz new file mode 100644 index 0000000..31300fb --- /dev/null +++ b/rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5578b2d081e0ff703b9a8b23693014a99bf751e1e743d9583589d0b3432b1e27 +size 11688 diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index ca80b53..aa6d9bc 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 08 13:49:46 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 84.87+git20180202.3df4ae7: + * Add testcases for MenuXDGCheck.py + ------------------------------------------------------------------- Wed Oct 11 11:29:25 UTC 2017 - opensuse-packaging@opensuse.org diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index 4fa1314..fc36945 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -24,7 +24,7 @@ BuildRequires: rpmlint-Factory-strict BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 84.87+git20171011.8b163ac +Version: 84.87+git20180202.3df4ae7 Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain diff --git a/rpmlint.changes b/rpmlint.changes index bf92bb3..2806e18 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Feb 08 13:49:48 UTC 2018 - opensuse-packaging@opensuse.org + +- Update rpmlint-checks to version master: + * Support uppercase tag macros used by RPM 4.14 + +------------------------------------------------------------------- +Thu Feb 08 13:49:46 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 84.87+git20180202.3df4ae7: + * Add testcases for MenuXDGCheck.py + ------------------------------------------------------------------- Tue Jan 23 11:05:10 UTC 2018 - dmueller@suse.com From e420fc78395e521c89dfe65397026f58047306249aefaf37ebe3d127db18053d Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Feb 2018 15:38:49 +0000 Subject: [PATCH 06/14] - Update rpmlint-checks to version master: * polkit: make untracked privileges also an error OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=564 --- _servicedata | 2 +- rpmlint-checks-master.tar.xz | 4 ++-- rpmlint.changes | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/_servicedata b/_servicedata index 9866355..be4aa4d 100644 --- a/_servicedata +++ b/_servicedata @@ -3,4 +3,4 @@ https://github.com/openSUSE/rpmlint-tests.git 91f443ae38b0bf051ab99c40b69d92c505907d04 https://github.com/openSUSE/rpmlint-checks.git - 6825f95a1dd2825b86609427148576cfcacdbd1f \ No newline at end of file + aecdbb0c5cee167387f7769a77148668e908a8d8 \ No newline at end of file diff --git a/rpmlint-checks-master.tar.xz b/rpmlint-checks-master.tar.xz index 2572b6e..2db124b 100644 --- a/rpmlint-checks-master.tar.xz +++ b/rpmlint-checks-master.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d6b78c923ba6de0449e3675b4eee341e5b4522e2108d53c52b181193186708c -size 23196 +oid sha256:673615c77f0afe748213b301d070b584cfbc2a45e60012e62714106cd5f00c69 +size 23192 diff --git a/rpmlint.changes b/rpmlint.changes index 2806e18..caca163 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 08 13:52:13 UTC 2018 - opensuse-packaging@opensuse.org + +- Update rpmlint-checks to version master: + * polkit: make untracked privileges also an error + ------------------------------------------------------------------- Thu Feb 08 13:49:48 UTC 2018 - opensuse-packaging@opensuse.org From f3e40f9a67feab530f10327c58f4baee4ff9fe33738f83f01188eae58434c613 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 13 Feb 2018 12:41:11 +0000 Subject: [PATCH 07/14] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=565 --- 0001-Improve-XDG-Menu-checks-stability.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0001-Improve-XDG-Menu-checks-stability.patch b/0001-Improve-XDG-Menu-checks-stability.patch index 0067d52..1549b01 100644 --- a/0001-Improve-XDG-Menu-checks-stability.patch +++ b/0001-Improve-XDG-Menu-checks-stability.patch @@ -41,7 +41,7 @@ Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py + def parse_desktop_file(self, pkg, root, f, filename): + cfp = cfgparser.RawConfigParser() + try: -+ with open(f, 'rb') as inputf: ++ with open(f, 'r') as inputf: + cfp.readfp(inputf, filename) + except cfgparser.DuplicateSectionError as e: + printError( From 27e0f946b34d48a622c5c6fd9bec8684a6306cec6029b2c20fb5eba78dae58b7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 15 Feb 2018 11:45:31 +0000 Subject: [PATCH 08/14] Accepting request 576938 from home:coolo:branches:openSUSE:Factory - Allow some deprecated licenses that we would replace on commit (SPDX 2->SPDX 3 conversion) OBS-URL: https://build.opensuse.org/request/show/576938 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=566 --- rpmlint.changes | 6 ++++++ rpmlint.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/rpmlint.changes b/rpmlint.changes index caca163..659c40a 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 15 09:35:51 UTC 2018 - coolo@suse.com + +- Allow some deprecated licenses that we would replace on commit + (SPDX 2->SPDX 3 conversion) + ------------------------------------------------------------------- Thu Feb 08 13:52:13 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/rpmlint.spec b/rpmlint.spec index f585fb6..859b9a2 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -142,6 +142,10 @@ cp %{SOURCE12} licenses.config cut '-d ' -f1 %{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes.txt | tail -n +2 | sort -u | while read l; do sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done +# add some deprecated licenses we allow for now +for l in AGPL-3.0 GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do + sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config +done install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/ %check From fc588f707ff98e3ca9736f0f50a02c64da035880a5b3e13f62bb7effc2ba86eb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 18 Feb 2018 14:28:33 +0000 Subject: [PATCH 09/14] - add 0001-Always-import-XDG-desktop-files-as-utf8.patch OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=567 --- ...ays-import-XDG-desktop-files-as-utf8.patch | 35 +++++++++++++++++++ 0001-Improve-XDG-Menu-checks-stability.patch | 2 +- rpmlint.changes | 5 +++ rpmlint.spec | 1 + 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-Always-import-XDG-desktop-files-as-utf8.patch diff --git a/0001-Always-import-XDG-desktop-files-as-utf8.patch b/0001-Always-import-XDG-desktop-files-as-utf8.patch new file mode 100644 index 0000000..c1af903 --- /dev/null +++ b/0001-Always-import-XDG-desktop-files-as-utf8.patch @@ -0,0 +1,35 @@ +From e090267a175d2f2d52128c780108835f36d1ef1e Mon Sep 17 00:00:00 2001 +From: Dirk Mueller +Date: Sun, 18 Feb 2018 15:23:39 +0100 +Subject: [PATCH] Always import XDG desktop files as utf8 + +Don't rely on them being entirely ASCII or the system +locale. +--- + MenuXDGCheck.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/MenuXDGCheck.py b/MenuXDGCheck.py +index 66912ea..d4418a9 100644 +--- a/MenuXDGCheck.py ++++ b/MenuXDGCheck.py +@@ -6,6 +6,7 @@ + # http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html + # + ++import codecs + import os + try: + import ConfigParser as cfgparser +@@ -30,7 +31,7 @@ class MenuXDGCheck(AbstractCheck.AbstractFilesCheck): + def parse_desktop_file(self, pkg, root, f, filename): + cfp = cfgparser.RawConfigParser() + try: +- with open(f, 'rb') as inputf: ++ with codecs.open(f, encoding='utf-8') as inputf: + cfp.readfp(inputf, filename) + except cfgparser.DuplicateSectionError as e: + printError( +-- +2.16.1 + diff --git a/0001-Improve-XDG-Menu-checks-stability.patch b/0001-Improve-XDG-Menu-checks-stability.patch index 1549b01..0067d52 100644 --- a/0001-Improve-XDG-Menu-checks-stability.patch +++ b/0001-Improve-XDG-Menu-checks-stability.patch @@ -41,7 +41,7 @@ Index: rpmlint-rpmlint-1.10/MenuXDGCheck.py + def parse_desktop_file(self, pkg, root, f, filename): + cfp = cfgparser.RawConfigParser() + try: -+ with open(f, 'r') as inputf: ++ with open(f, 'rb') as inputf: + cfp.readfp(inputf, filename) + except cfgparser.DuplicateSectionError as e: + printError( diff --git a/rpmlint.changes b/rpmlint.changes index 659c40a..ad51382 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 18 14:26:09 UTC 2018 - dmueller@suse.com + +- add 0001-Always-import-XDG-desktop-files-as-utf8.patch + ------------------------------------------------------------------- Thu Feb 15 09:35:51 UTC 2018 - coolo@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 859b9a2..78add9e 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -89,6 +89,7 @@ Patch70: rpmlint-all-pie.patch Patch71: 0001-Avoid-calling-close-on-undefined-fd-variable.patch Patch72: rpmlint-slpp-NUM-NUM.patch Patch73: 0001-Binariescheck-Check-for-chroot-chdir-on-ARM-PPC.patch +Patch74: 0001-Always-import-XDG-desktop-files-as-utf8.patch BuildRequires: obs-service-format_spec_file BuildRequires: python3-flake8 BuildRequires: python3-pytest From 95afc7bd76233e7df787c18e44295b37b6eeef158890f51e36b10de730695e07 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 18 Feb 2018 14:55:19 +0000 Subject: [PATCH 10/14] - Update to version 84.87+git20180218.9a5c783: * Update polkit ref tests OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=568 --- _servicedata | 2 +- rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz | 3 --- rpmlint-tests-84.87+git20180218.9a5c783.tar.xz | 3 +++ rpmlint-tests.changes | 6 ++++++ rpmlint-tests.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz create mode 100644 rpmlint-tests-84.87+git20180218.9a5c783.tar.xz diff --git a/_servicedata b/_servicedata index be4aa4d..b1da913 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpmlint-tests.git - 91f443ae38b0bf051ab99c40b69d92c505907d04 + 9a5c783b185134300479c47c3c9bc2d5ce9800e6 https://github.com/openSUSE/rpmlint-checks.git aecdbb0c5cee167387f7769a77148668e908a8d8 \ No newline at end of file diff --git a/rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz b/rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz deleted file mode 100644 index 31300fb..0000000 --- a/rpmlint-tests-84.87+git20180202.3df4ae7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5578b2d081e0ff703b9a8b23693014a99bf751e1e743d9583589d0b3432b1e27 -size 11688 diff --git a/rpmlint-tests-84.87+git20180218.9a5c783.tar.xz b/rpmlint-tests-84.87+git20180218.9a5c783.tar.xz new file mode 100644 index 0000000..680859a --- /dev/null +++ b/rpmlint-tests-84.87+git20180218.9a5c783.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6423e23a37d669e622a05418842a67fda13cf6f02bd924d9cf9b48ad9af46cf +size 11704 diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index aa6d9bc..ef85e74 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 18 14:54:38 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 84.87+git20180218.9a5c783: + * Update polkit ref tests + ------------------------------------------------------------------- Thu Feb 08 13:49:46 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index fc36945..ffbb2bd 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -24,7 +24,7 @@ BuildRequires: rpmlint-Factory-strict BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 84.87+git20180202.3df4ae7 +Version: 84.87+git20180218.9a5c783 Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain From 1411277d1eeea272368b66bae594607012c381b58392498b5f2ea671a442de05 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 18 Feb 2018 14:57:08 +0000 Subject: [PATCH 11/14] - Update to version 84.87+git20180218.1142fcc: OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=569 --- _servicedata | 2 +- rpmlint-tests.changes | 4 ++-- rpmlint-tests.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_servicedata b/_servicedata index b1da913..26809d1 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/rpmlint-tests.git - 9a5c783b185134300479c47c3c9bc2d5ce9800e6 + 1142fccbca0a0f3f4bbb4be8f98e26904e9f45f5 https://github.com/openSUSE/rpmlint-checks.git aecdbb0c5cee167387f7769a77148668e908a8d8 \ No newline at end of file diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes index ef85e74..622c2ae 100644 --- a/rpmlint-tests.changes +++ b/rpmlint-tests.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Sun Feb 18 14:54:38 UTC 2018 - opensuse-packaging@opensuse.org +Sun Feb 18 14:56:22 UTC 2018 - opensuse-packaging@opensuse.org -- Update to version 84.87+git20180218.9a5c783: +- Update to version 84.87+git20180218.1142fcc: * Update polkit ref tests ------------------------------------------------------------------- diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec index ffbb2bd..d3e7297 100644 --- a/rpmlint-tests.spec +++ b/rpmlint-tests.spec @@ -24,7 +24,7 @@ BuildRequires: rpmlint-Factory-strict BuildRequires: rpmlint-mini Name: rpmlint-tests -Version: 84.87+git20180218.9a5c783 +Version: 84.87+git20180218.1142fcc Release: 0 Summary: rpmlint regression tests License: SUSE-Public-Domain From fdb8ab6dfe66e2dca15bf4f914a8e7743eb54956840237aff61d942c03311953 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 18 Feb 2018 14:59:07 +0000 Subject: [PATCH 12/14] OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=570 --- rpmlint-tests-84.87+git20180218.1142fcc.tar.xz | 3 +++ rpmlint-tests-84.87+git20180218.9a5c783.tar.xz | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 rpmlint-tests-84.87+git20180218.1142fcc.tar.xz delete mode 100644 rpmlint-tests-84.87+git20180218.9a5c783.tar.xz diff --git a/rpmlint-tests-84.87+git20180218.1142fcc.tar.xz b/rpmlint-tests-84.87+git20180218.1142fcc.tar.xz new file mode 100644 index 0000000..8ce66f0 --- /dev/null +++ b/rpmlint-tests-84.87+git20180218.1142fcc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cdcd9bb53faf76a3c9aa049553324bc17f73d05f2e75cb7212763dc404d24b6e +size 11696 diff --git a/rpmlint-tests-84.87+git20180218.9a5c783.tar.xz b/rpmlint-tests-84.87+git20180218.9a5c783.tar.xz deleted file mode 100644 index 680859a..0000000 --- a/rpmlint-tests-84.87+git20180218.9a5c783.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6423e23a37d669e622a05418842a67fda13cf6f02bd924d9cf9b48ad9af46cf -size 11704 From 0b2848951f0dfb35d2135394a20aab671d68ef7ac5b80e2529fd4a389f1b71a8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 20 Feb 2018 10:07:31 +0000 Subject: [PATCH 13/14] Accepting request 578225 from home:coolo:branches:openSUSE:Factory - allow more deprecated licenses to unbreak ring1+2 OBS-URL: https://build.opensuse.org/request/show/578225 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=571 --- rpmlint.changes | 5 +++++ rpmlint.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rpmlint.changes b/rpmlint.changes index ad51382..89095f7 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 05:37:21 UTC 2018 - coolo@suse.com + +- allow more deprecated licenses to unbreak ring1+2 + ------------------------------------------------------------------- Sun Feb 18 14:26:09 UTC 2018 - dmueller@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 78add9e..76e93bb 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -144,7 +144,9 @@ cut '-d ' -f1 %{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done # add some deprecated licenses we allow for now -for l in AGPL-3.0 GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do +for l in AGPL-3.0 AGPL-3.0+ GFDL-1.1 GFDL-1.1+ GFDL-1.2 GFDL-1.2+ GFDL-1.3 GFDL-1.3+ GPL-3.0-with-GCC-exception \ + GPL-2.0-with-classpath-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \ + GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/ From 66ddf7034173bbd1fb2a19a15c7bdbad646d7e6cd402f612d43670adfce9a520 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 20 Feb 2018 13:11:54 +0000 Subject: [PATCH 14/14] Accepting request 578342 from home:dimstar:Factory - Add one more deprecated license: + GPL-2.0-with-font-exception. Hopefully the last one to unbreak rings 1 + 2 OBS-URL: https://build.opensuse.org/request/show/578342 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=572 --- rpmlint.changes | 6 ++++++ rpmlint.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpmlint.changes b/rpmlint.changes index 89095f7..2d9d192 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 12:52:18 UTC 2018 - dimstar@opensuse.org + +- Add one more deprecated license: + + GPL-2.0-with-font-exception. + ------------------------------------------------------------------- Tue Feb 20 05:37:21 UTC 2018 - coolo@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 76e93bb..adfa1fd 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -145,7 +145,7 @@ cut '-d ' -f1 %{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes done # add some deprecated licenses we allow for now for l in AGPL-3.0 AGPL-3.0+ GFDL-1.1 GFDL-1.1+ GFDL-1.2 GFDL-1.2+ GFDL-1.3 GFDL-1.3+ GPL-3.0-with-GCC-exception \ - GPL-2.0-with-classpath-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \ + GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \ GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done