commit f1067c402ce0c9a7a6153ff149dc6ae33f30e3ca
Author: Arkadiusz Miśkiewicz <ar...@maven.pl>
Date: Sat Aug 11 18:43:54 2018 +0200
- rel 9; allow multiple rpmdef options
multiple-options.patch | 16 ++++++++++++++++
poldek.spec | 4 +++-
2 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/poldek.spec b/poldek.spec
index 52bed99..4a2dc04 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -34,7 +34,7 @@
%define ver_rpm 5.4.10
%endif
-%define rel 8
+%define rel 9
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
@@ -67,6 +67,7 @@ Patch3: WTERMSIG.patch
Patch4: %{name}-multiproto.patch
Patch5: python-fix.patch
Patch6: poldek-ext-down-enable.patch
+Patch7: multiple-options.patch
URL: http://poldek.pld-linux.org/
BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
BuildRequires: autoconf
@@ -234,6 +235,7 @@ Moduły języka Python dla poldka.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%{__rm} m4/libtool.m4 m4/lt*.m4
diff --git a/multiple-options.patch b/multiple-options.patch
new file mode 100644
index 0000000..7ba67b3
--- /dev/null
+++ b/multiple-options.patch
@@ -0,0 +1,16 @@
+--- poldek-0.32.2/conf.c~ 2016-01-30 15:05:57.000000000 +0100
++++ poldek-0.32.2/conf.c 2018-08-11 18:43:17.635821800 +0200
+@@ -1226,8 +1226,12 @@ tn_hash *poldek_conf_addlines(tn_hash *h
+ n_strdupap(line, &tmp);
+
+ if (split_option_line(tmp, &name, &value, NULL, 0)) {
++ unsigned add_flags = ADD_PARAM_VALIDATE;
++ // allow multiple rpmdef values
++ if (strcmp(name, "rpmdef") != 0)
++ add_flags |= ADD_PARAM_OVERWRITE;
+ if (!add_param(ht_sect, sectnam, name, value,
+- ADD_PARAM_VALIDATE | ADD_PARAM_OVERWRITE, NULL, 0))
++ add_flags, NULL, 0))
+ nerr++;
+ }
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/f1067c402ce0c9a7a6153ff149dc6ae33f30e3ca
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
