mirror of
https://github.com/clearlinux/autospec.git
synced 2026-07-13 16:36:08 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a62a849262 | |||
| eaa4f711da | |||
| f35655a0cc | |||
| 0c573b604b |
@@ -483,12 +483,16 @@ class Specfile(object):
|
||||
self._write_strip(f"gpg --homedir .gnupg --status-fd 1 --verify {self.config.signature_macro} %{{SOURCE0}} > gpg.status")
|
||||
self._write_strip(f"grep -E '^\\[GNUPG:\\] (GOODSIG|EXPKEYSIG) {self.keyid}' gpg.status")
|
||||
self.write_prep_prepend()
|
||||
prefix = self.content.prefixes[self.url]
|
||||
if self.config.default_pattern == 'R':
|
||||
prefix = self.content.tarball_prefix
|
||||
self._write_strip("%setup -q -n " + prefix)
|
||||
else:
|
||||
self._write_strip("%setup -q -n " + prefix)
|
||||
prefix = self.content.prefixes[self.url]
|
||||
if not prefix:
|
||||
prefix = os.path.splitext(os.path.basename(self.url))[0]
|
||||
self._write_strip("%setup -q -c -n " + prefix)
|
||||
else:
|
||||
self._write_strip("%setup -q -n " + prefix)
|
||||
for archive in self.config.sources["archive"]:
|
||||
# Handle various archive types
|
||||
extract_cmd = 'tar xf {}'
|
||||
|
||||
+2
-1
@@ -295,7 +295,8 @@ class Content():
|
||||
if "github.com" in self.url:
|
||||
# define regex accepted for valid packages, important for specific
|
||||
# patterns to come before general ones
|
||||
github_patterns = [r"https?://github.com/(.*)/(.*?)/archive/refs/tags/[vVrR]?(.*)\.tar",
|
||||
github_patterns = [r"https?://github.com/(.*)/(.*?)/archive/refs/tags/.*/(.*).tar",
|
||||
r"https?://github.com/(.*)/(.*?)/archive/refs/tags/[vVrR]?(.*)\.tar",
|
||||
r"https?://github.com/(.*)/(.*?)/archive/[v|r]?.*/(.*).tar",
|
||||
r"https?://github.com/(.*)/(.*?)/archive/[-a-zA-Z_]*-(.*).tar",
|
||||
r"https?://github.com/(.*)/(.*?)/archive/[vVrR]?(.*).tar",
|
||||
|
||||
+15
-1
@@ -90,6 +90,20 @@ def _process_line(line, prev_line, current_patch, reported_patches, error):
|
||||
_log_error("Compiler: " + m.group('error'))
|
||||
return True
|
||||
|
||||
if m := re.match(r'Could NOT find (?P<package>.*) .missing', line):
|
||||
_log_error("CMake module " + m.group('package') + " not found")
|
||||
return True
|
||||
if m := re.match(r'Could not find a package configuration file provided by (?P<package>.*) with', line):
|
||||
_log_error("CMake module " + m.group('package') + " not found")
|
||||
return True
|
||||
# Unable to find program 'gperf'
|
||||
if m := re.match(r"Failed to find program ‘(?P<module>.*)’", line):
|
||||
_log_error("Failed to find " + m.group('module'))
|
||||
return True
|
||||
if m := re.match(r"Failed to find ‘(?P<module>.*)’", line):
|
||||
_log_error("Failed to find " + m.group('module'))
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
|
||||
@@ -98,7 +112,7 @@ def _process_build_log(filename):
|
||||
lines = lfile.readlines()
|
||||
|
||||
prev_line = ''
|
||||
current_patch = ''
|
||||
current_patch = ['']
|
||||
reported_patches = {}
|
||||
error = False
|
||||
for line in lines:
|
||||
|
||||
@@ -1612,3 +1612,4 @@ http://sourceforge.net/projects/zsh/files/zsh/5.4.2/zsh-5.4.2.tar.gz,zsh,5.4.2
|
||||
https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3.11-pigeonhole-0.5.11.tar.gz,pigeonhole,0.5.11
|
||||
https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-0.5.20.tar.gz,pigeonhole,0.5.20
|
||||
https://www.ezix.org/software/files/lshw-B.02.19.2.tar.gz,lshw,02.19.2
|
||||
https://github.com/VectorCamp/vectorscan/archive/refs/tags/vectorscan/5.4.11.tar.gz,vectorscan,5.4.11
|
||||
|
||||
Reference in New Issue
Block a user