- rel 6: add upstream patches

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 6c97adf541dffc9336ded12d35b17c8f2d0d6e73..cceeca9926232d735187957b9211cebb944e67e7 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -3,19 +3,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
-%bcond_with    snap    # don't build python bindings
+%bcond_with    snap    # install configs for official Th snapshot
 
-%if %{with snap}
+# current snapshot name
 %define                SNAP    2012
-%endif
 
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define        ver_db  4.7.25
-%define        ver_db_rel      1
-%define        ver_rpm 4.5-49
+%define                ver_db          5.2
+%define                ver_db_rel      3
+%define                ver_rpm         5.4.10
 
-%define                snap    rc5
-%define                rel     12
+%define                snap    rc6
+%define                rel     6%{?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
@@ -25,8 +24,8 @@ Release:      1.%{snap}.%{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/~cactus/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
-# Source0-md5: ab89926c28cfb6b7d72497fc37c16ac4
+Source0:       http://carme.pld-linux.org/~megabajt/snaps/poldek/%{name}-%{version}%{snap}.tar.xz
+# Source0-md5: 4b528ad356b02efdd72b81f1ecaceb83
 Source1:       %{name}.conf
 Source2:       %{name}-multilib.conf
 Source5:       %{name}-aliases.conf
@@ -43,8 +42,10 @@ 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}-am.patch
+Patch4:                %{name}-link-rpmio.patch
+Patch5:                %{name}-vrpmlog.patch
+Patch6:                %{name}-git.patch
+Patch7:                %{name}-db52.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -87,7 +88,8 @@ Requires:     %{name}-libs = %{version}-%{release}
 Requires:      db >= %{ver_db}-%{ver_db_rel}
 Requires:      rpm >= %{ver_rpm}
 Requires:      rpm-db-ver = %{ver_db}
-Requires:      rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
+#Requires:     rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
+Requires:      rpm-lib >= 5.4.10
 # vf* scripts use sed
 Requires:      sed
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -208,6 +210,8 @@ Moduły języka Python dla poldka.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
@@ -311,7 +315,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
 %{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_archive_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.conf
 %endif
 
-%if %{with snap}
+# Always install snapshot configs
 %{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' \
        -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE100} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
 %{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' \
@@ -320,8 +324,12 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
        %{__sed} -e 's|%%ARCH%%|%{_ftp_alt_arch}|g' \
                -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE101} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-multilib.conf
 %endif
+
+%if %{with snap}
 %{__sed} -i -e 's|@@SNAP@@||g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+%{__sed} -i '/@@SNAP@@.*/d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
 %else
+%{__sed} -i -e 's|@@SNAP@@||g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}.conf
 %{__sed} -i '/@@SNAP@@.*/d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
 %endif