- 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 ced4485544f2f034b827e653267dbd11b2b22e3d..720ecdd0b64759b61dd464ba0105d0e48aa9d0c5 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -15,7 +15,7 @@
 %define        ver_rpm 4.5-5
 #
 %define                snap    20080820.23
-%define                rel             16
+%define                rel             29
 Summary:       RPM packages management helper tool
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
@@ -33,6 +33,7 @@ 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
@@ -53,6 +54,10 @@ 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
@@ -143,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.
@@ -197,6 +203,10 @@ Moduły języka Python dla poldka.
 %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
@@ -265,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 '
@@ -276,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
@@ -302,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}