# HG changeset patch # User Wolfgang Rosenauer # Date 1518178855 -3600 # Node ID cd02d400c081b7618a5a1b0c3d5cd07a82e62a89 # Parent 725d6acf23b5baf5d1fd9ac18d47e1ccdbf8494a correct requires and provides handling (boo#1076907) diff -r 725d6acf23b5 -r cd02d400c081 MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Wed Feb 07 19:42:16 2018 +0100 +++ b/MozillaFirefox/MozillaFirefox.changes Fri Feb 09 13:20:55 2018 +0100 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 9 12:06:31 UTC 2018 - wr@rosenauer.org + +- correct requires and provides handling (boo#1076907) + +------------------------------------------------------------------- Tue Feb 6 07:03:42 UTC 2018 - fstrba@suse.com - Added patch: diff -r 725d6acf23b5 -r cd02d400c081 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Wed Feb 07 19:42:16 2018 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Fri Feb 09 13:20:55 2018 +0100 @@ -42,10 +42,8 @@ %define gnome_dir %{_prefix} %define desktop_file_name %{progname} %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} -%define _use_internal_dependency_generator 0 -%define __find_requires sh %{SOURCE4} -%global provfind sh -c "grep -v '.so' | %__find_provides" -%global __find_provides %provfind +%define __provides_exclude ^lib.*\\.so.*$ +%define __requires_exclude ^(libmoz.*|liblgpllibs.*|libxul.*)$ %define localize 1 %ifarch %ix86 x86_64 %define crashreporter 1 @@ -126,7 +124,6 @@ Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in -Source4: find-external-requires.sh Source5: source-stamp.txt Source6: kde.js Source7: l10n-%{version}.tar.xz diff -r 725d6acf23b5 -r cd02d400c081 MozillaFirefox/find-external-requires.sh --- a/MozillaFirefox/find-external-requires.sh Wed Feb 07 19:42:16 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -#!/bin/sh -# Finds requirements provided outside of the current file set - -filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) -provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) -echo "$filelist" \ - | /usr/lib/rpm/find-requires \ - | grep -F -v "$provides" \ - | sort -u