- fixed multiple protocols support in fetchers' "proto=" clause

diff --git a/poldek-multiproto.patch b/poldek-multiproto.patch
new file mode 100644 (file)
index 0000000..3565009
--- /dev/null
+++ b/poldek-multiproto.patch
@@ -0,0 +1,12 @@
+diff -ur -x .svn -x .git -x .bzr -x CVS -ruNp poldek-0.32.2.orig/conf_sections.c poldek-0.32.2/conf_sections.c
+--- poldek-0.32.2.orig/conf_sections.c 2016-01-30 18:21:06.000000000 +0100
++++ poldek-0.32.2/conf_sections.c      2017-03-31 20:34:21.955834004 +0200
+@@ -362,7 +362,7 @@ static struct poldek_conf_tag fetcher_ta
+              0, { 0 } },
+              
+    { "proto", 
+-     CONF_TYPE_STRING | CONF_TYPE_F_REQUIRED,
++     CONF_TYPE_STRING | CONF_TYPE_F_REQUIRED | CONF_TYPE_F_LIST,
+              NULL,
+              0, { 0 } },
+              

diff --git a/poldek.spec b/poldek.spec
index 12c380ba047a489dbf106cf24aec8dd7a32be16b..2b70655b8a3675313661d1ee5e5c1a2eecbea79b 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -34,7 +34,7 @@
 %define                ver_rpm         5.4.10
 %endif
 
-%define                rel     4
+%define                rel     5
 Summary:       RPM packages management helper tool
 Summary(hu.UTF-8):     RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -64,6 +64,7 @@ Patch0:               %{name}-size-type.patch
 Patch1:                %{name}-config.patch
 Patch2:                pm-hooks.patch
 Patch3:                WTERMSIG.patch
+Patch4:                %{name}-multiproto.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: autoconf
@@ -228,6 +229,7 @@ Moduły języka Python dla poldka.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4