Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2023-10-20 23:16:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.1945 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Fri Oct 20 23:16:35 2023 rev:552 rq:1118979 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2023-03-30 22:50:59.764487792 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.1945/yast2.changes 2023-10-20 23:17:26.744005610 +0200 @@ -1,0 +2,11 @@ +Thu Oct 5 08:50:25 UTC 2023 - Martin Vidner <[email protected]> + +- Fix case-insensitive finding of LICENSE.*.TXT (bsc#1215698) +- 5.0.1 + +------------------------------------------------------------------- +Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <[email protected]> + +- 5.0.0 (bsc#1185510) + +------------------------------------------------------------------- Old: ---- yast2-4.6.2.tar.bz2 New: ---- yast2-5.0.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.ACMV4O/_old 2023-10-20 23:17:27.424030421 +0200 +++ /var/tmp/diff_new_pack.ACMV4O/_new 2023-10-20 23:17:27.428030567 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.6.2 +Version: 5.0.1 Release: 0 Summary: YaST2 Main Package ++++++ yast2-4.6.2.tar.bz2 -> yast2-5.0.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.6.2/library/packages/src/lib/y2packager/licenses_fetchers/archive.rb new/yast2-5.0.1/library/packages/src/lib/y2packager/licenses_fetchers/archive.rb --- old/yast2-4.6.2/library/packages/src/lib/y2packager/licenses_fetchers/archive.rb 2023-03-29 17:13:31.000000000 +0200 +++ new/yast2-5.0.1/library/packages/src/lib/y2packager/licenses_fetchers/archive.rb 2023-10-18 23:22:43.000000000 +0200 @@ -42,7 +42,7 @@ begin unpack_archive - license_files = Dir.glob(File.join(archive_dir, "**", "LICENSE.*.TXT"), File::FNM_CASEFOLD) + license_files = find_case_insensitive(archive_dir, "LICENSE.*.TXT") # NOTE: despite the use of the case-insensitive flag, the captured group will be # returned as it is. languages = license_files.map { |path| path[/LICENSE.(\w*).TXT/i, 1] } @@ -155,12 +155,22 @@ # Return the path for the given file in specified directory # - # @param directory [String] Directory where licenses were unpacked - # @param file [String] File name (without directory component) - # + # @param (see #find_case_insensitive) # @return [String, nil] The file path; nil if was not found - def find_path_for(directory, file) - Dir.glob(File.join(directory, "**", file), File::FNM_CASEFOLD).first + def find_path_for(directory, fileglob) + find_case_insensitive(directory, fileglob).first + end + + # Return paths for the given file glob in specified directory + # + # @param directory [String] Directory, whole subtree is searched + # @param fileglob [String] File name, with glob characters like `*` `{a,b}`, case insensitive + # @return [Array<String>] All found file paths + def find_case_insensitive(directory, fileglob) + files = Dir.glob(File.join(directory, "**", "*")) + files.find_all do |fn| + File.fnmatch?(File.join(directory, "**", fileglob), fn, File::FNM_CASEFOLD | File::FNM_EXTGLOB) + end end end end Binary files old/yast2-4.6.2/library/packages/test/data/rpm/licenses_test.tar.gz and new/yast2-5.0.1/library/packages/test/data/rpm/licenses_test.tar.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.6.2/package/yast2.changes new/yast2-5.0.1/package/yast2.changes --- old/yast2-4.6.2/package/yast2.changes 2023-03-29 17:13:31.000000000 +0200 +++ new/yast2-5.0.1/package/yast2.changes 2023-10-18 23:22:43.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Oct 5 08:50:25 UTC 2023 - Martin Vidner <[email protected]> + +- Fix case-insensitive finding of LICENSE.*.TXT (bsc#1215698) +- 5.0.1 + +------------------------------------------------------------------- +Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger <[email protected]> + +- 5.0.0 (bsc#1185510) + +------------------------------------------------------------------- Wed Mar 29 13:13:52 UTC 2023 - Josef Reidinger <[email protected]> - Replace calls to mkinitrd with dracut as mkinitrd will be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.6.2/package/yast2.spec new/yast2-5.0.1/package/yast2.spec --- old/yast2-4.6.2/package/yast2.spec 2023-03-29 17:13:31.000000000 +0200 +++ new/yast2-5.0.1/package/yast2.spec 2023-10-18 23:22:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.6.2 +Version: 5.0.1 Release: 0 Summary: YaST2 Main Package
