diff --git a/0001-Allow-package-names-with-Epoch.patch b/0001-Allow-package-names-with-Epoch.patch new file mode 100644 index 0000000..d9e53cc --- /dev/null +++ b/0001-Allow-package-names-with-Epoch.patch @@ -0,0 +1,29 @@ +From c03ba1435760d543b8c5531a40b5b4b2a823f674 Mon Sep 17 00:00:00 2001 +From: Jakub Filak +Date: Tue, 22 Mar 2016 16:35:36 +0100 +Subject: [PATCH] Allow package names with Epoch + +Epoch should be a number and 0 means it is not set. + +https://fedoraproject.org/wiki/Packaging:Guidelines#Use_of_Epochs +https://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s03.html +--- + src/lib/retrace.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/retrace.py b/src/lib/retrace.py +index 38b9c0d..dc9f60c 100644 +--- a/src/lib/retrace.py ++++ b/src/lib/retrace.py +@@ -70,7 +70,7 @@ INPUT_CHARSET_PARSER = re.compile("^([a-zA-Z0-9\-]+)(,.*)?$") + #en_GB, sk-SK, cs, fr etc. + INPUT_LANG_PARSER = re.compile("^([a-z]{2}([_\-][A-Z]{2})?)(,.*)?$") + #characters allowed by Fedora Naming Guidelines +-INPUT_PACKAGE_PARSER = re.compile("^[a-zA-Z0-9\-\.\_\+]+$") ++INPUT_PACKAGE_PARSER = re.compile("^([1-9][0-9]*:)?[a-zA-Z0-9\-\.\_\+]+$") + #architecture (i386, x86_64, armv7hl, mips4kec) + INPUT_ARCH_PARSER = re.compile("^[a-zA-Z0-9_]+$") + #name-version-arch (fedora-16-x86_64, rhel-6.2-i386, opensuse-12.1-x86_64) +-- +2.7.4 + diff --git a/retrace-server.spec b/retrace-server.spec index 2ec12b5..a5df00a 100644 --- a/retrace-server.spec +++ b/retrace-server.spec @@ -3,13 +3,14 @@ Summary: Application for remote coredump analysis Name: retrace-server Version: 1.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/wiki/AbrtRetraceServer Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz # git format-patch -N -M --topo-order %%{version} +Patch0001: 0001-Allow-package-names-with-Epoch.patch BuildArch: noarch @@ -52,6 +53,7 @@ generation service over a network using HTTP protocol. %prep %setup -q +%patch0001 -p1 %build autoreconf @@ -136,6 +138,9 @@ fi %doc COPYING INSTALL README TODO %changelog +* Tue Mar 22 2016 Jakub Filak - 1.15-2 +- Allow package names with Epoch + * Fri Mar 18 2016 Jakub Filak - 1.15-1 - Correct paths to Fedora development releases - Fix small problem with strip_vmcore calling prepare_debuginfo