Author: glen Date: Sun Aug 22 15:52:01 2010 GMT
Module: packages Tag: AC-DEVEL
---- Log message:
- updated to 0.30-pre1 from HEAD
---- Files affected:
packages/poldek:
poldek-config.patch (1.9 -> 1.9.4.1) , poldek.spec (1.315.2.22 ->
1.315.2.23)
---- Diffs:
================================================================
Index: packages/poldek/poldek-config.patch
diff -u packages/poldek/poldek-config.patch:1.9
packages/poldek/poldek-config.patch:1.9.4.1
--- packages/poldek/poldek-config.patch:1.9 Mon May 19 23:13:15 2008
+++ packages/poldek/poldek-config.patch Sun Aug 22 17:51:56 2010
@@ -1,6 +1,6 @@
---- poldek-0.30-cvs20080519.22/conf/poldek.conf 2008-05-19
22:09:20.000000000 +0200
-+++ poldek-0.30-cvs20080519.22.new/conf/poldek.conf 2008-05-19
22:34:49.000000000 +0200
-@@ -127,11 +127,10 @@
+--- 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.
@@ -8,7 +8,7 @@
+choose equivalents manually = yes
# Prevent package listed from being upgraded if they are already installed.
--# hold = kernel*
+ # hold = kernel* foo*.i686 th-test:* *-smp-* th-ready:bar*.x86_64
-#hold =
+hold = kernel*
================================================================
Index: packages/poldek/poldek.spec
diff -u packages/poldek/poldek.spec:1.315.2.22
packages/poldek/poldek.spec:1.315.2.23
--- packages/poldek/poldek.spec:1.315.2.22 Tue Apr 13 23:26:35 2010
+++ packages/poldek/poldek.spec Sun Aug 22 17:51:56 2010
@@ -1,4 +1,6 @@
# $Revision$, $Date$
+# TODO:
+# - fails to build without poldek-devel - fix it !
#
# Conditional build:
%bcond_with static # don't use shared libraries
@@ -9,9 +11,10 @@
%define ver_db 4.3.27-1
%define ver_rpm 4.4.9-1
-%define snap 20080820.23
-%define rel 41
+%define snap rc1
+%define rel 2%{pld_release}
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
@@ -19,8 +22,8 @@
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}-cvs%{snap}.tar.bz2
-# Source0-md5: 2738eb3996f1cdf1e5d74b913d6e7414
+Source0:
http://carme.pld-linux.org/~megabajt/snaps/poldek/%{name}-%{version}%{snap}.tar.bz2
+# Source0-md5: ff3bde5f9451d2691d67112182b7a2df
Source1: %{name}.conf
Source2: %{name}-multilib.conf
Source5: %{name}-aliases.conf
@@ -29,44 +32,14 @@
Patch100: %{name}-dirdeps.patch
Patch0: %{name}-vserver-packages.patch
Patch1: %{name}-config.patch
-Patch2: %{name}-abort-on-upgrade.patch
-Patch3: %{name}-inline.patch
-Patch4: %{name}-ls-llu.patch
-Patch5: %{name}-op-ldalldesc.patch
-Patch6: %{name}-nocolor-upgrade.patch
-Patch7: %{name}-upgrade-dist.patch
-Patch8: %{name}-keep-reinstalled-provides.patch
-Patch9: %{name}-dont-ask-for-suggests-on-errors.patch
-Patch10: %{name}-crash-on-invalid-locale.patch
-Patch11: %{name}-noutf8.patch
-Patch12: %{name}-dont-suggests-required-packages.patch
-Patch13: %{name}-tty-for-erasures.patch
-Patch14: %{name}-both_langs.patch
-Patch15: %{name}-317130.patch
-Patch16: %{name}-321546.patch
-Patch17: %{name}-size-type.patch
-Patch18: %{name}-no-inlines.patch
-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
-Patch35: %{name}-zlib.patch
+Patch2: %{name}-size-type.patch
+Patch3: gcc-fvisibility.patch
+Patch4: ac-prog-libtool.patch
URL: http://poldek.pld-linux.org/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
+BuildRequires: check-devel
BuildRequires: db-devel >= %{ver_db}
BuildRequires: gettext-autopoint
BuildRequires: gettext-devel
@@ -122,6 +95,20 @@
%{!?with_imode:This version hasn't got interactive mode.}
#'vim
+%description -l hu.UTF-8
+poldek egy RPM csomagkezelő eszköz, amely megkönnyíti a
+csomagellenőrzést, telepítést (beleértve a rendszertelepítést a
+nulláról), frissítést és eltávolítást.
+
+A program használható parancssorból (mint a Debian apt-get programja)
+vagy interaktív módban. Az interaktív mód egy readline környezetet
+jelent, parancskiegészítéssel és előzményekkel, hasonlóan a Perl CPAN
+shell módjához.
+
+%{?with_static:Ez a verzió statikusan linkelt.}
+
+%{!?with_imode:Ennek a verziónak nincs interaktív módja.}
+
%description -l pl.UTF-8
poldek jest narzędziem linii poleceń służącym do weryfikacji,
instalacji (włączając instalację systemu od zera), aktualizacji i
@@ -138,17 +125,22 @@
%package libs
Summary: poldek libraries
+Summary(hu.UTF-8): A poldek könyvtárai
Summary(pl.UTF-8): Biblioteki poldka
Group: Libraries
%description libs
poldek libraries.
+%description libs -l hu.UTF-8
+A poldek könyvtárai.
+
%description libs -l pl.UTF-8
Biblioteki poldka.
%package devel
Summary: Header files for poldek libraries
+Summary(hu.UTF-8): A poldek könyvtár fejlesztői fájljai
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek poldka
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
@@ -157,11 +149,15 @@
%description devel
Header files for poldek libraries.
+%description devel -l hu.UTF-8
+A poldek könyvtár fejlesztői fájljai.
+
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek poldka.
%package static
Summary: poldek static libraries
+Summary(hu.UTF-8): poldek statikus könyvtárak
Summary(pl.UTF-8): Biblioteki statyczne poldka
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
@@ -169,11 +165,15 @@
%description static
poldek static libraries.
+%description static -l hu.UTF-8
+poldek statikus könyvtárak.
+
%description static -l pl.UTF-8
Biblioteki statyczne poldka.
%package -n python-poldek
Summary: Python modules for poldek
+Summary(hu.UTF-8): Python modulok poldek-hez
Summary(pl.UTF-8): Moduły języka Python dla poldka
Group: Libraries/Python
Requires: %{name}-libs = %{version}-%{release}
@@ -182,66 +182,30 @@
%description -n python-poldek
Python modules for poldek.
+%description -n python-poldek -l hu.UTF-8
+Python modulok poldek-hez.
+
%description -n python-poldek -l pl.UTF-8
Moduły języka Python dla poldka.
%prep
-%setup -q -n %{name}-%{version}%{?snap:-cvs%{snap}}
+%setup -q
%patch100 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%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
-# fixes failures with zlib >= 1.2.3.7
-%patch35 -p0
+
+rm -f m4/libtool.m4 m4/lt*.m4
# cleanup backups after patching
find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
%build
-%{__autopoint}
+%{__libtoolize}
%{__aclocal} -I m4
+%{__autoheader}
%{__autoconf}
%{__automake}
cp -f config.sub trurlib
@@ -424,7 +388,7 @@
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc README* NEWS TODO configs
+%doc ChangeLog README* NEWS TODO configs
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/repos.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.conf
@@ -479,6 +443,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.315.2.23 2010/08/22 15:51:56 glen
+- updated to 0.30-pre1 from HEAD
+
Revision 1.315.2.22 2010/04/13 21:26:35 glen
- up to rel 41 with zlib fixes
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek-config.patch?r1=1.9&r2=1.9.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/poldek/poldek.spec?r1=1.315.2.22&r2=1.315.2.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
