- decode strings that may be urlencoded before displaying, fixes lp#381548

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 51da3f17a6e4e16ac288a44ef5ccfa995a8669e6..720ecdd0b64759b61dd464ba0105d0e48aa9d0c5 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -12,10 +12,10 @@
 %define        ver_db  4.7.25
 %define        ver_db_rel      1
 %endif
-%define        ver_rpm 4.4.9-56
+%define        ver_rpm 4.5-5
 #
-%define                snap    20080519.22
-%define                rel             3
+%define                snap    20080820.23
+%define                rel             29
 Summary:       RPM packages management helper tool
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
@@ -24,8 +24,8 @@ Release:      0.%{snap}.%{rel}
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
-Source0:       %{name}-%{version}-cvs%{snap}.tar.bz2
-# Source0-md5: 41c50bb17f8ac2b50d8838c8a346d0ec
+Source0:       http://carme.pld-linux.org/~megabajt/snaps/poldek/%{name}-%{version}-cvs%{snap}.tar.bz2
+# Source0-md5: 2738eb3996f1cdf1e5d74b913d6e7414
 Source1:       %{name}.conf
 Source2:       %{name}-multilib.conf
 Source3:       %{name}-ti.conf
@@ -33,9 +33,31 @@ Source4:     %{name}-multilib-ti.conf
 Source5:       %{name}-aliases.conf
 Source6:       %{name}.desktop
 Source7:       %{name}.png
+Source8:       %{name}-debuginfo.conf
 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
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -126,6 +148,7 @@ Summary:    Header files for poldek libraries
 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.
@@ -163,12 +186,32 @@ Moduły języka Python dla poldka.
 %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
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 %build
-%{__autopoint}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -232,9 +275,13 @@ sed '
 ' < %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
 %endif
 %else
+# pld_release = th
 sed -e '
        s|%%ARCH%%|%{_ftp_arch}|g
 ' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+sed -e '
+       s|%%ARCH%%|%{_ftp_arch}|g
+' < %{SOURCE8} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
 
 %ifarch %{x8664}
 sed '
@@ -243,7 +290,7 @@ sed '
 %endif
 %endif
 
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/aliases.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
 
 %if %{with imode}
 # add desktop file and icon
@@ -269,8 +316,24 @@ rm -f $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
 %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}