+++ /dev/null
---- poldek-0.30.0/configure.ac~ 2013-03-09 13:14:38.000000000 +0200
-+++ poldek-0.30.0/configure.ac 2013-05-07 11:18:01.889839519 +0300
-@@ -574,7 +574,10 @@
- AC_SUBST(SYSCONFDIR)
-
-
--PKGLIBDIR="`echo $libdir/$PACKAGE`"
-+AC_ARG_WITH(pkglibdir,
-+[ --with-pkglibdir program executables],
-+PKGLIBDIR=$withval, PKGLIBDIR="`echo $libdir/$PACKAGE`")
-+
- while echo ${PKGLIBDIR} | grep '\$' >/dev/null; do
- PKGLIBDIR=$(eval echo ${PKGLIBDIR});
- done
---- poldek-0.30.0/Makefile.am~ 2013-03-05 14:05:24.000000000 +0200
-+++ poldek-0.30.0/Makefile.am 2013-05-07 11:47:28.936268884 +0300
-@@ -78,7 +78,7 @@
-
- LDADD_ = @INTLLIBS@
-
--vfscriptsdir = $(libdir)/$(PACKAGE_NAME)
-+vfscriptsdir = $(PKGLIBDIR)
- vfscripts_SCRIPTS = zlib-in-rpm.sh vfjuggle vfcompr vfsmb poldekuser-setup.sh
-
- EXTRA_DIST = \
+++ /dev/null
---- poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:37:12.737381529 +0300
-+++ poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:38:47.231352866 +0300
-@@ -369,7 +369,7 @@
- </description>
- </option>
-
-- <option name="choose equivalents manually" type="boolean" default="no" op="EQPKG_ASKUSER">
-+ <option name="choose equivalents manually" type="boolean" default="yes" op="EQPKG_ASKUSER">
- <description>
- Let the user select package among equivalents.
- </description>
-@@ -598,7 +598,7 @@
- </description>
- </option>
-
-- <option name="hold" type="string" list="yes" default="" multiple="yes">
-+ <option name="hold" type="string" list="yes" default="kernel*" multiple="yes">
- <description>
- Have the same meaning as [ global ] parameter. Example:
- [screen]
---- poldek-0.30/conf/poldek.conf~ 2010-08-22 14:19:51.000000000 +0300
-+++ poldek-0.30/conf/poldek.conf 2010-08-22 14:20:28.524878981 +0300
-@@ -127,11 +127,11 @@
- #confirm removal = yes
-
- # Let the user select package among equivalents.
--#choose equivalents manually = no
-+choose equivalents manually = yes
-
- # Prevent package listed from being upgraded if they are already installed.
- # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
--#hold =
-+hold = kernel*
-
- # Ignore package list - packages fits given mask will be invisible.
- # ignore = *-smp-* foo*
---- poldek-0.30/conf_sections.c~ 2012-04-04 12:01:04.000000000 +0300
-+++ poldek-0.30/conf_sections.c 2012-04-04 12:04:46.080171888 +0300
-@@ -173,7 +173,7 @@
-
- { "choose equivalents manually",
- CONF_TYPE_BOOLEAN,
-- "no",
-+ "yes",
- POLDEK_OP_EQPKG_ASKUSER, { 0 } },
-
- { "hold",
+++ /dev/null
-commit 9ecd484cd077adba94649b83b3f3bfd639644056
-Author: Marcin Banasiak <marcin.banasiak@gmail.com>
-Date: Wed Mar 20 00:09:57 2013 +0100
-
- rpmvercmp: read macro configuration files before using rpmEVRparse()
-
-diff --git a/pm/rpm/rpmvercmp.c b/pm/rpm/rpmvercmp.c
-index 968489a..d83f26b 100644
---- a/pm/rpm/rpmvercmp.c
-+++ b/pm/rpm/rpmvercmp.c
-@@ -1,6 +1,6 @@
- /*
- Copyright (C) 2000 - 2008 Pawel A. Gajda <mis@pld-linux.org>
-- Copyright (C) 2010 - 2012 Marcin Banasiak <marcin.banasiak@gmail.com>
-+ Copyright (C) 2010 - 2013 Marcin Banasiak <marcin.banasiak@gmail.com>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License, version 2 as
-@@ -20,7 +20,10 @@
- #include <stdlib.h>
-
- #ifdef HAVE_RPM_5
-+# include <rpm/rpmrc.h>
- # include <rpm/rpmtag.h>
-+#else
-+# include <rpm/rpmlib.h>
- #endif
-
- #define _RPMEVR_INTERNAL
-@@ -61,6 +64,11 @@ int main(int argc, char *argv[])
- exit(1);
- }
-
-+ if (rpmReadConfigFiles(NULL, NULL) < 0) {
-+ fprintf(stderr, "Failed to read configuration files\n");
-+ exit(2);
-+ }
-+
- evr1 = malloc(sizeof(struct EVR_s));
- evr2 = malloc(sizeof(struct EVR_s));
-
+++ /dev/null
-commit 84563d90b30b05d1705d84344f75aec5f7fd6f58
-Author: Kacper Kornet <draenog@pld-linux.org>
-Date: Tue May 7 08:45:51 2013 +0100
-
- Fix for crashes on subpackages with inherited group
-
- In normal case RPMTAG_GROUP is RPM_I18NSTRING_TYPE. However when group
- is inherited from main package in some versions of rpm5 it is
- RPM_STRING_TYPE. What's worse some versions of rpm5 returns
- RPM_STRING_TYPE but report RPM_I18NSTRING_TYPE. However the last
- behaviour is so buggy that we don't care about it.
-
- Reverts 810280a1e3be737bf074b536c414eadbb0f38596 and adds proper
- fix for https://bugs.launchpad.net/poldek/+bug/966972 by reusing
- existing code.
-
-diff --git a/pkgroup.c b/pkgroup.c
-index 9fdeaf9..cd8bf4d 100644
---- a/pkgroup.c
-+++ b/pkgroup.c
-@@ -470,21 +470,17 @@ int pkgroup_idx_update_rpmhdr(struct pkgroup_idx *idx, void *rpmhdr)
-
- DBGF("ngroups %d, %d\n", ngroups, n_array_size(langs));
- for (i=0; i < ngroups; i++) {
-- const char *lang = n_array_nth(langs, i);
--
-- const char *grp = groups;
-- if (ngroups > 1) grp = groups[i];
--
-- DBGF(" gr[%d of %d] %s\n", i, ngroups, grp);
--
-- if (n_str_eq(lang, "C")) {
-- if ((gr = n_hash_get(idx->ht, grp)) == NULL) {
-- gr = pkgroup_new(n_array_size(idx->arr) + 1, grp);
-- n_array_push(idx->arr, gr);
-- n_hash_insert(idx->ht, gr->name, gr);
-+ const char *lang = n_array_nth(langs, i);
-+ DBGF(" gr[%d of %d] %s\n", i, ngroups, groups[i]);
-+
-+ if (n_str_eq(lang, "C")) {
-+ if ((gr = n_hash_get(idx->ht, groups[i])) == NULL) {
-+ gr = pkgroup_new(n_array_size(idx->arr) + 1, groups[i]);
-+ n_array_push(idx->arr, gr);
-+ n_hash_insert(idx->ht, gr->name, gr);
-+ }
-+ break;
- }
-- break;
-- }
- }
-
- if (gr != NULL) {
-diff --git a/pm/rpm/rpmhdr.c b/pm/rpm/rpmhdr.c
-index 817803c..dd24be5 100644
---- a/pm/rpm/rpmhdr.c
-+++ b/pm/rpm/rpmhdr.c
-@@ -121,7 +121,6 @@ int pm_rpmhdr_get_raw_entry(Header h, int32_t tag, void *buf, int32_t *cnt)
- }
- #endif
-
--#ifndef HAVE_RPM_5
- if (tag == RPMTAG_GROUP && type == RPM_STRING_TYPE) { // build by old rpm
- char **g;
-
-@@ -132,7 +131,6 @@ int pm_rpmhdr_get_raw_entry(Header h, int32_t tag, void *buf, int32_t *cnt)
- g[1] = NULL;
- *(char ***)buf = g;
- }
--#endif
-
- DBGF("%d type=%d, cnt=%d\n", tag, type, *cnt);
- return 1;
+++ /dev/null
---- poldek/conf/poldek.conf~ 2008-02-26 17:10:23.000000000 +0100
-+++ poldek/conf/poldek.conf 2008-02-26 17:11:24.789742706 +0100
-@@ -138,7 +138,7 @@
-
- # Ignore package list - packages fits given mask will be invisible.
- # ignore = *-smp-* foo*
--# ignore = vserver-packages
-+ignore = vserver-packages
- #ignore =
-
- # Conflicts with already installed packages are treated as resolved
%define ver_db_rel 3
%define ver_rpm 5.4.10
-%define snap rc7
-%define rel 4%{?with_snap:.%{SNAP}}
+%define rel 2%{?with_snap:.%{SNAP}}
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.0
-Release: 1.%{snap}.%{rel}
+Release: %{rel}
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/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
-# Source0-md5: 56ba9e7b709a99965f42e24e65eb2d7f
+Source0: http://carme.pld-linux.org/~megabajt/releases/poldek/%{name}-%{version}.tar.xz
+# Source0-md5: 392cfa125912fbedb6cc6d54dfbb80e3
Source1: %{name}.conf
Source2: %{name}-multilib.conf
Source5: %{name}-aliases.conf
Source100: %{name}-snap.conf
Source101: %{name}-multilib-snap.conf
Source102: %{name}-debuginfo-snap.conf
-Patch0: %{name}-vserver-packages.patch
-Patch1: %{name}-config.patch
-Patch2: %{name}-size-type.patch
-Patch3: %{name}-Os-fail-workaround.patch
-Patch4: %{name}-git.patch
-Patch5: %{name}-inherited-group.patch
-Patch6: pkglibdir.patch
+Patch0: %{name}-size-type.patch
+Patch1: %{name}-Os-fail-workaround.patch
URL: http://poldek.pld-linux.org/
BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
BuildRequires: autoconf
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%{__rm} m4/libtool.m4 m4/lt*.m4
projects / packages / poldek.git / commitdiff