- rel 6; enable external downloaders by default and move fetcher registration errors...

diff --git a/poldek-ext-down-enable.patch b/poldek-ext-down-enable.patch
new file mode 100644 (file)
index 0000000..c4a9bf5
--- /dev/null
+++ b/poldek-ext-down-enable.patch
@@ -0,0 +1,37 @@
+diff -urN poldek-0.32.2.org/conf/poldek.conf poldek-0.32.2/conf/poldek.conf
+--- poldek-0.32.2.org/conf/poldek.conf 2016-02-03 22:02:49.000000000 +0100
++++ poldek-0.32.2/conf/poldek.conf     2017-11-23 09:21:23.347551541 +0100
+@@ -15,7 +15,7 @@
+ 
+ # External downloaders configuration, not necessary in most cases, cause
+ # to internal HTTP and FTP client.
+-#%include fetch.conf
++%include fetch.conf
+ 
+ [global]
+ 
+diff -urN poldek-0.32.2.org/vfile/fetch.c poldek-0.32.2/vfile/fetch.c
+--- poldek-0.32.2.org/vfile/fetch.c    2016-01-30 15:05:57.000000000 +0100
++++ poldek-0.32.2/vfile/fetch.c        2017-11-23 09:38:01.044442691 +0100
+@@ -163,7 +163,9 @@
+         if (vf_find_external_command(p, PATH_MAX, path, NULL))
+             path = p;
+         else {
+-            vf_logerr("%s: command not found\n", path);
++            if (*vfile_verbose > 0) {
++                vf_logerr("%s: command not found\n", path);
++            }
+             return NULL;
+         }
+     }
+@@ -494,7 +496,9 @@
+     }
+     
+     if ((ftch = ffetcher_new(name, protocols, cmd)) == NULL) {
+-        vf_logerr("External downloader '%s': registration failed\n", cmd);
++        if (*vfile_verbose > 0) {
++            vf_logerr("External downloader '%s': registration failed\n", cmd);
++        }
+         
+     } else {
+         if (ffetchers == NULL) {

diff --git a/poldek.spec b/poldek.spec
index 18e1addd8cda37e10d2f871e268a05a7858b5870..939a41ecd27b2db3486eb371b17b6b6f23765dc1 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -34,7 +34,7 @@
 %define                ver_rpm         5.4.10
 %endif
 
-%define                rel     5
+%define                rel     6
 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
@@ -66,6 +66,7 @@ Patch2:               pm-hooks.patch
 Patch3:                WTERMSIG.patch
 Patch4:                %{name}-multiproto.patch
 Patch5:                python-fix.patch
+Patch6:                poldek-ext-down-enable.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: autoconf
@@ -232,6 +233,7 @@ Moduły języka Python dla poldka.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4