packages (AC-DEVEL): poldek/poldek.spec - synced patches with head up to re...

[glen]

Author: glen                         Date: Mon Feb  8 15:03:01 2010 GMT
Module: packages                      Tag: AC-DEVEL
---- Log message:
- synced patches with head up to rel .36

---- Files affected:
packages/poldek:
   poldek.spec (1.315.2.20 -> 1.315.2.21) 

---- Diffs:

================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.315.2.20 packages/poldek/poldek.spec:1.315.2.21
--- packages/poldek/poldek.spec:1.315.2.20	Fri Mar  6 15:29:51 2009
+++ packages/poldek/poldek.spec	Mon Feb  8 16:02:52 2010
@@ -4,18 +4,18 @@
 %bcond_with	static	# don't use shared libraries
 %bcond_without	imode	# don't build interactive mode
 %bcond_without	python	# don't build python bindings
-#
+
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %define	ver_db	4.3.27-1
 %define	ver_rpm	4.4.9-1
-#
+
 %define		snap	20080820.23
-%define		rel		22
+%define		rel		36
 Summary:	RPM packages management helper tool
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:		poldek
 Version:	0.30
-Release:	0.%{snap}.15.%{rel}
+Release:	0.%{snap}.%{rel}
 License:	GPL v2
 Group:		Applications/System
 #Source0:	http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
@@ -49,18 +49,30 @@
 Patch19:	%{name}-export-missing-symbol.patch
 Patch20:	%{name}-skip-suggests-on-upgrade.patch
 Patch21:	%{name}-po.patch
+Patch22:	%{name}-refcnt.patch
+Patch23:	%{name}-assertion-failed.patch
+Patch24:	%{name}-unescape-urlencoded-strings.patch
+Patch25:	%{name}-ls-source-rpm.patch
+Patch26:	%{name}-add-arch-match.patch
+Patch27:	%{name}-multilib-upgrade.patch
+Patch28:	%{name}-score-reqs-marked-to-install.patch
+Patch29:	%{name}-dont-be-greedy.patch
+Patch30:	%{name}-dont-lose-deps.patch
+Patch31:	%{name}-ls-queryfmt.patch
+Patch32:	%{name}-prepare_url_fix.patch
+Patch33:	%{name}-noloop_on_terminal_loos.patch
+Patch34:	%{name}-show_only_relative_used_space.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bzip2-devel
-BuildRequires:	check
 BuildRequires:	db-devel >= %{ver_db}
 BuildRequires:	gettext-autopoint
+BuildRequires:	gettext-devel
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	pcre-devel
-BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 %{?with_python:BuildRequires:	python-devel}
@@ -68,7 +80,6 @@
 BuildRequires:	rpm-devel >= %{ver_rpm}
 %{?with_python:BuildRequires:	rpm-pythonprov}
 BuildRequires:	sed >= 4.0
-BuildRequires:	xmlto
 BuildRequires:	zlib-devel
 %if %{with static}
 BuildRequires:	bzip2-static
@@ -140,6 +151,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek poldka
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	rpm-devel >= %{ver_rpm}
 
 %description devel
 Header files for poldek libraries.
@@ -197,6 +209,29 @@
 %patch19 -p0
 %patch20 -p1
 %patch21 -p1
+%patch22 -p0
+%patch23 -p1
+%patch24 -p1
+# LP#392984: add source rpm to ls
+%patch25 -p1
+# LP#408036
+%patch26 -p1
+# LP#408034
+%patch27 -p1
+# score reqs already marked to install
+%patch28 -p1
+# dont be greedy if upgraded pkg has needed capabilities
+%patch29 -p1
+# http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2009-November/150519.html
+%patch30 -p1 
+# LP#392984: add query format to ls
+%patch31 -p1
+# LP#506568
+%patch32 -p0
+# LP#499504
+%patch33 -p1
+# do not info. about amount of transaction space req. but relative to already installed
+%patch34 -p1
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -215,6 +250,7 @@
 	--enable-nls \
 	%{?with_python:--with-python}
 %{__make}
+#	--enable-trace
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -286,8 +322,24 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p	/sbin/postshell
--/usr/sbin/fix-info-dir -c %{_infodir}
+%post
+[ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
+if [ "$1" = "1" ]; then
+	# remove ignore = vserver-packages inside vserver on first install
+	{
+		while read f ctx; do
+			[ "$f" = "VxID:" -o "$f" = "s_context:" ] && break
+		done </proc/self/status
+	} 2>/dev/null
+	if [ -z "$ctx" -o "$ctx" = "0" ]; then
+		VSERVER=no
+	else
+		VSERVER=yes
+	fi
+	if [ "$VSERVER" = "yes" ]; then
+		%{__sed} -i -e '/^ignore/s/vserver-packages//' %{_sysconfdir}/%{name}/poldek.conf
+	fi
+fi
 
 %postun	-p	/sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
@@ -424,6 +476,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.315.2.21  2010/02/08 15:02:52  glen
+- synced patches with head up to rel .36
+
 Revision 1.315.2.20  2009/03/06 14:29:51  glen
 - keep base rel 15
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek.spec?r1=1.315.2.20&r2=1.315.2.21&f=u