+++ /dev/null
-diff -ruNp poldek-0.30.1.orig/install3/preinstall.c poldek-0.30.1/install3/preinstall.c
---- poldek-0.30.1.orig/install3/preinstall.c 2014-03-25 23:32:25.000000000 +0100
-+++ poldek-0.30.1/install3/preinstall.c 2015-10-21 21:53:10.190934930 +0200
-@@ -199,8 +199,10 @@ int i3_pre_ts_install(struct poldek_ts *
- if (!pkg_is_marked(ts->pms, pkg))
- continue;
-
-- if (sigint_reached())
-+ if (sigint_reached()) {
-+ n_array_cfree(pkgs);
- return -1;
-+ }
-
- installable = i3_is_pkg_installable(ts, pkg, 1);
-
+++ /dev/null
-diff -urp poldek-0.30.1.org/configure.ac poldek-0.30.1/configure.ac
---- poldek-0.30.1.org/configure.ac 2014-03-26 20:23:01.000000000 +0100
-+++ poldek-0.30.1/configure.ac 2015-12-16 08:43:07.693420809 +0100
-@@ -51,6 +51,8 @@ dnl AC_DEFINE([ENABLE_VFILE_TRURLIO],1,[
-
- AC_DISABLE_STATIC
-
-+AC_SYS_LARGEFILE
-+
- dnl Checks for programs.
- m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
- AC_PROG_CC()
-Tylko w poldek-0.30.1: configure.ac~
-diff -urp poldek-0.30.1.org/tndb/configure.ac poldek-0.30.1/tndb/configure.ac
---- poldek-0.30.1.org/tndb/configure.ac 2014-03-26 20:20:43.000000000 +0100
-+++ poldek-0.30.1/tndb/configure.ac 2015-12-16 08:45:36.390318410 +0100
-@@ -15,6 +15,8 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-g
- AM_MAINTAINER_MODE([enable])
- AM_SILENT_RULES([no])
-
-+AC_SYS_LARGEFILE
-+
- # Checks for programs.
- m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
- AC_PROG_CC
-diff -urp poldek-0.30.1.org/trurlib/configure.ac poldek-0.30.1/trurlib/configure.ac
---- poldek-0.30.1.org/trurlib/configure.ac 2014-03-26 20:20:45.000000000 +0100
-+++ poldek-0.30.1/trurlib/configure.ac 2015-12-16 08:45:25.400054699 +0100
-@@ -15,6 +15,8 @@ AM_INIT_AUTOMAKE([1.11 foreign no-dist-g
- AM_MAINTAINER_MODE([enable])
- AM_SILENT_RULES([no])
-
-+AC_SYS_LARGEFILE
-+
- # Checks for programs.
- m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
- AC_PROG_CC
---- poldek-0.30.1/vfile/vfff/vfff.h~ 2014-03-25 23:32:25.000000000 +0100
-+++ poldek-0.30.1/vfile/vfff/vfff.h 2015-12-27 22:03:53.306854171 +0100
-@@ -13,6 +13,10 @@
- #ifndef VFFF_VCN_H
- #define VFFF_VCN_H
-
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <stdarg.h>
- #include <sys/param.h> /* for PATH_MAX */
- #include <netinet/in.h>
---- poldek-0.30.1/vfile/vfff/ftp.c.dd 2015-12-28 16:29:34.793238446 +0000
-+++ poldek-0.30.1/vfile/vfff/ftp.c 2015-12-28 16:29:47.105324341 +0000
-@@ -10,6 +10,10 @@
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
---- poldek-0.30.1/vfile/vfff/http.c.dd 2015-12-28 16:28:59.848990134 +0000
-+++ poldek-0.30.1/vfile/vfff/http.c 2015-12-28 16:29:25.201170973 +0000
-@@ -10,6 +10,10 @@
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <ctype.h>
- #include <errno.h>
- #include <fcntl.h>
---- poldek-0.30.1/vfile/vfff/vfff.h.dd 2015-12-28 16:30:06.337456985 +0000
-+++ poldek-0.30.1/vfile/vfff/vfff.h 2015-12-28 16:30:46.305727157 +0000
-@@ -22,6 +22,9 @@
- #include <netinet/in.h>
- #include <time.h>
-
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- #ifndef IPPORT_HTTP
- # define IPPORT_HTTP 80
- #endif
---- poldek-0.30.1/vfile/vfreq.h.dd 2014-03-25 22:32:25.000000000 +0000
-+++ poldek-0.30.1/vfile/vfreq.h 2015-12-28 16:27:45.504435535 +0000
-@@ -13,6 +13,13 @@
- #ifndef POLDEK_VFILE_VFREQ_H
- #define POLDEK_VFILE_VFREQ_H
-
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
-+#include <sys/types.h>
-+#include <unistd.h>
-+
- #include <time.h>
-
- void *vf_progress_new(const char *label);
---- poldek-0.30.1/vfile/vfff/vfff.c.dd 2014-03-25 22:32:25.000000000 +0000
-+++ poldek-0.30.1/vfile/vfff/vfff.c 2015-12-28 16:59:18.775511542 +0000
-@@ -10,6 +10,10 @@
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-+#ifdef HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <arpa/inet.h>
- #include <ctype.h>
- #include <errno.h>
+++ /dev/null
---- a/trurlib/nmalloc.c
-+++ b/trurlib/nmalloc.c
-@@ -18,9 +18,10 @@
- Boston, MA 02111-1307, USA.
- */
-
--/*
-- $Id$
-- */
-+#if HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #include <stddef.h>
- #include <stdio.h>
- #include <stdlib.h>
+++ /dev/null
---- poldek-0.30.1/pkgdir/pkgdir.c~ 2014-03-25 23:32:25.000000000 +0100
-+++ poldek-0.30.1/pkgdir/pkgdir.c 2015-09-14 14:16:12.282109741 +0200
-@@ -274,7 +274,8 @@ const struct pkgdir_module *find_module(
- static void env_source(const struct source *src, const char *idxpath)
- {
- setenv("POLDEK_SOURCE_PATH", idxpath, 1);
-- setenv("POLDEK_SOURCE_PREFIX", src->pkg_prefix, 1);
-+ if (src->pkg_prefix)
-+ setenv("POLDEK_SOURCE_PREFIX", src->pkg_prefix, 1);
- setenv("POLDEK_SOURCE_TYPE", src->type, 1);
- if (src->name)
- setenv("POLDEK_SOURCE_NAME", src->name, 1);
+++ /dev/null
-commit 7769cc05f6060d3b2ed10a042aae82f4a8644bfb
-Author: Marcin Banasiak <marcin.banasiak@gmail.com>
-Date: Sun Nov 29 20:47:25 2015 +0100
-
- Always try to update orphaned package if successor is available.
-
- Fixes issue described on:
- http://lists.pld-linux.org/mailman/pipermail/pld-users-pl/2015-November/078844.html
-
-diff --git a/install3/requirements.c b/install3/requirements.c
-index f78f398..781af67 100644
---- a/install3/requirements.c
-+++ b/install3/requirements.c
-@@ -300,7 +300,7 @@ static int try_to_upgrade_orphan(int indent, struct i3ctx *ictx,
- struct successor succ;
- struct pkg *sucpkg;
- char *message = NULL;
-- int install = 0;
-+ struct i3pkg *i3tomark = NULL;
-
- tracef(indent, "%s req: %s (satisfied=%s)", pkg_id(pkg),
- capreq_stra(req), req_satisfier ? "yes": "no");
-@@ -314,40 +314,21 @@ static int try_to_upgrade_orphan(int indent, struct i3ctx *ictx,
- }
-
- /* already in inset or will be there soon */
-- if (i3_is_marked(ictx, sucpkg) || pkg_is_marked_i(ictx->ts->pms, sucpkg)) {
-+ if (i3_is_marked(ictx, sucpkg) || pkg_is_marked_i(ictx->ts->pms, sucpkg))
- message = "already marked";
-- install = 1;
-- goto l_end;
-- }
--
-- if (pkg_requires_cap(sucpkg, req)) {
-- message = "successor requires req too";
-- install = 0;
--
-- } else {
-- if (succ.by_obsoletes)
-- message = "by Obsoletes tag";
-+ else if (succ.by_obsoletes)
-+ message = "by Obsoletes tag";
-+ else if (ictx->ts->getop(ictx->ts, POLDEK_OP_GREEDY))
-+ message = "upgrade resolves req";
-
-- else if (ictx->ts->getop(ictx->ts, POLDEK_OP_GREEDY))
-- message = "upgrade resolves req";
-+ i3tomark = i3pkg_new(sucpkg, 0, pkg, req, I3PKGBY_GREEDY);
-
-- install = 1;
-- }
-+ tracef(indent, "- %s: upgrading orphan%s%s%s", pkg_id(sucpkg),
-+ message ? " (":"", message ? message:"", message ? ")":"");
-
--l_end:
-- if (!install) {
-- tracef(indent, "- %s: do not upgrading orphan%s%s%s", pkg_id(sucpkg),
-- message ? " (":"", message ? message:"", message ? ")":"");
--
-- } else {
-- struct i3pkg *i3tomark = i3pkg_new(sucpkg, 0, pkg, req, I3PKGBY_GREEDY);
-+ i3_process_package(indent, ictx, i3tomark);
-
-- tracef(indent, "- %s: upgrading orphan%s%s%s", pkg_id(sucpkg),
-- message ? " (":"", message ? message:"", message ? ")":"");
-- i3_process_package(indent, ictx, i3tomark);
-- }
--
-- return install;
-+ return 1;
- }
-
-
%define ver_rpm 5.4.10
%endif
-%define rel 17
+%define rel 1
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
Name: poldek
-Version: 0.30.1
+Version: 0.32.0
Release: %{rel}%{?with_snap:.%{SNAP}}
License: GPL v2
Group: Applications/System
#Source0: http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
Source0: http://carme.pld-linux.org/~megabajt/releases/poldek/%{name}-%{version}.tar.xz
-# Source0-md5: e569c8454df0932df53b09cee9998927
+# Source0-md5: 85de8f1fc2a0b5dfae7e98bb83065c05
Source1: %{name}.conf
Source2: %{name}-multilib.conf
Source3: %{name}-config.sh
Source102: %{name}-debuginfo-snap.conf
Patch0: %{name}-size-type.patch
Patch1: %{name}-config.patch
-Patch2: %{name}-missing-include.patch
-Patch3: pm-hooks.patch
-Patch4: %{name}-setenv-null.patch
-Patch5: %{name}-assert-sigint.patch
-Patch6: %{name}-upgrade-orphan.patch
-Patch7: %{name}-largefile.patch
+Patch2: pm-hooks.patch
URL: http://poldek.pld-linux.org/
BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
BuildRequires: autoconf
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%{__rm} m4/libtool.m4 m4/lt*.m4
projects / packages / poldek.git / commitdiff