[packages/poldek/AC-branch] recreate AC-branch from master
glen
glen at pld-linux.org
Sat Sep 1 12:00:12 CEST 2012
commit da83ee7c9ef2410f6ae94a59bc6774bfaf06cfb5
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat Sep 1 12:59:41 2012 +0300
recreate AC-branch from master
poldek-dirdeps.patch | 34 ++++++++++++++++
poldek-multilib.conf | 84 +++++++++++++++++++++++++++-----------
poldek.conf | 83 +++++++++++++++++---------------------
poldek.spec | 112 ++++++++++++++++-----------------------------------
4 files changed, 166 insertions(+), 147 deletions(-)
---
diff --git a/poldek.spec b/poldek.spec
index 9cc5ecc..086083a 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -1,21 +1,17 @@
+# TODO:
+# - fails to build without poldek-devel - fix it !
#
# Conditional build:
%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 # install configs for official Th snapshot
-
-%if %{with snap}
-%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_db 4.5.20
%define ver_rpm 4.5-49
%define snap rc5
-%define rel 12
+%define rel 14
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
@@ -32,19 +28,12 @@ Source2: %{name}-multilib.conf
Source5: %{name}-aliases.conf
Source6: %{name}.desktop
Source7: %{name}.png
-Source8: %{name}-debuginfo.conf
-Source9: %{name}-aidath.conf
-Source10: %{name}-multilib-aidath.conf
-Source11: %{name}-archive.conf
-Source100: %{name}-snap.conf
-Source101: %{name}-multilib-snap.conf
-Source102: %{name}-debuginfo-snap.conf
+Patch100: %{name}-dirdeps.patch
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
Patch6: https://bugs.launchpad.net/poldek/+bug/1031767/+attachment/3252805/+files/%{name}-ls-space-lp1031767.patch
# Patch6-md5: 9ba0f7abdb2ba1051e1a396f9daec606
URL: http://poldek.pld-linux.org/
@@ -52,12 +41,11 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
BuildRequires: check-devel
-BuildRequires: db-devel >= %{ver_db}-%{ver_db_rel}
-BuildRequires: docbook-dtd412-xml
+BuildRequires: db-devel >= %{ver_db}
+BuildRequires: gettext-autopoint
BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: libxml2-devel
-BuildRequires: neon-devel
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pcre-devel
BuildRequires: pkgconfig
@@ -66,12 +54,13 @@ BuildRequires: popt-devel
BuildRequires: readline-devel >= 5.0
BuildRequires: rpm-devel >= %{ver_rpm}
%{?with_python:BuildRequires: rpm-pythonprov}
+BuildRequires: sed >= 4.0
BuildRequires: swig-python
BuildRequires: xmlto
BuildRequires: zlib-devel
%if %{with static}
BuildRequires: bzip2-static
-BuildRequires: db-static >= %{ver_db}-%{ver_db_rel}
+BuildRequires: db-static >= %{ver_db}
BuildRequires: glibc-static
BuildRequires: libselinux-static
BuildRequires: libxml2-static
@@ -86,9 +75,9 @@ BuildRequires: zlib-static
Requires(triggerpostun): awk
Requires(triggerpostun): sed >= 4.0
Requires: %{name}-libs = %{version}-%{release}
-Requires: db >= %{ver_db}-%{ver_db_rel}
+Requires: db >= %{ver_db}
+Requires: openssl >= 0.9.7d
Requires: rpm >= %{ver_rpm}
-Requires: rpm-db-ver = %{ver_db}
Requires: rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
# vf* scripts use sed
Requires: sed
@@ -204,12 +193,12 @@ Moduły języka Python dla poldka.
%prep
%setup -q
+%patch100 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%{__rm} m4/libtool.m4 m4/lt*.m4
@@ -260,72 +249,35 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/repos.d,/var/cache/%{name}}
libdir=%{py_sitedir}
%endif
-%{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
+%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
-%ifarch i486 i686 ppc sparc alpha athlon
- %define _ftp_arch %{_target_cpu}
+%ifarch i386 i586 i686 ppc sparc alpha athlon
+%define _ftp_arch %{_target_cpu}
%endif
%ifarch %{x8664}
- %define _ftp_arch x86_64
- %define _ftp_alt_arch i686
+%define _ftp_arch amd64
+%define _ftp_alt_arch i686
%endif
-%ifarch i586
- %define _ftp_arch i486
+%ifarch i486
+%define _ftp_arch i386
%endif
%ifarch pentium2 pentium3 pentium4
- %define _ftp_arch i686
-%endif
-%ifarch sparcv9 sparc64
- %define _ftp_arch sparc
- %define _ftp_arch %{_target_cpu}
- %ifarch sparc64
- %define _ftp_alt_arch sparcv9
- %endif
-%endif
-
-%define pld_conf %{SOURCE1}
-%define pld_debuginfo_conf %{SOURCE8}
-%define pld_archive_conf %{SOURCE11}
-
-%ifarch %{x8664}
- %define pld_multilib_conf %{SOURCE2}
+%define _ftp_arch i686
%endif
-
-# aidath
%ifarch sparcv9 sparc64
- %define pld_conf %{SOURCE9}
- %undefine pld_archive_conf
-%endif
-%ifarch sparc64
- %define pld_multilib_conf %{SOURCE10}
-%endif
-
-%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-
-%if 0%{?pld_multilib_conf:1}
- %{__sed} 's|%%ARCH%%|%{_ftp_alt_arch}|g' < %{pld_multilib_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+%define _ftp_arch sparc
%endif
-%if 0%{?pld_debuginfo_conf:1}
-%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_debuginfo_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.conf
-%endif
+%{?with_static:rm -f $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
-%if 0%{?pld_archive_conf:1}
-%{__sed} -e 's|%%ARCH%%|%{_ftp_arch}|g' < %{pld_archive_conf} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.conf
-%endif
+sed -e '
+ s|%%ARCH%%|%{_ftp_arch}|g
+' < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-%if %{with snap}
-%{__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' \
- -e 's|%%SNAP%%|%{SNAP}|g' < %{SOURCE102} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{SNAP}-debuginfo.conf
%ifarch %{x8664}
- %{__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
-%{__sed} -i -e 's|@@SNAP@@||g' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
-%else
-%{__sed} -i '/@@SNAP@@.*/d' $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.conf
+sed '
+ s|%%ARCH%%|%{_ftp_alt_arch}|g
+' < %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
%endif
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/cli.conf
@@ -437,13 +389,17 @@ fi
if [ -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave ]; then
cp -f %{_sysconfdir}/%{name}/repos.d/pld.conf{,.rpmnew}
- cp -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf
+ mv -f %{_sysconfdir}/%{name}/pld-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld.conf
+ %{__sed} -i -e 's,_pld_arch,_arch,g;s,_ac_idxtype,_type,g;s,_pld_prefix,_prefix,g' \
+ %{_sysconfdir}/%{name}/repos.d/pld.conf
fi
%ifarch %{x8664}
if [ -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave ]; then
cp -f %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf{,.rpmnew}
- cp -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+ mv -f %{_sysconfdir}/%{name}/pld-multilib-source.conf.rpmsave %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
+ %{__sed} -i -e 's,_pld_arch,_arch,g;s,_ac_idxtype,_type,g;s,_pld_prefix,_prefix,g' \
+ %{_sysconfdir}/%{name}/repos.d/pld-multilib.conf
fi
%endif
diff --git a/poldek-dirdeps.patch b/poldek-dirdeps.patch
new file mode 100644
index 0000000..5ccd5fc
--- /dev/null
+++ b/poldek-dirdeps.patch
@@ -0,0 +1,34 @@
+--- poldek-0.21-cvs20070703.00/conf/poldek.conf~ 2008-02-14 16:12:15.604671074 +0200
++++ poldek-0.21-cvs20070703.00/conf/poldek.conf 2008-02-14 16:13:12.373118918 +0200
+@@ -160,6 +160,9 @@
+ # Subtle dependency processing options, they should not be changed
+ # unless you know what you are doing
+
++# RPM 4.4.6 introduces auto dependencies based on package directories. Option controls this feature.
++auto directory dependencies = no
++
+ # Automatically install packages required by installed ones.
+ #follow = yes
+
+--- poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:37:12.737381529 +0300
++++ poldek-0.30/doc/poldek.conf.xml 2012-04-04 11:38:47.231352866 +0300
+@@ -435,7 +435,7 @@
+ <option name="dependency solver" type="integer" default="3" hidden="yes">
+ </option>
+
+- <option name="auto directory dependencies" type="boolean3" default="auto" op="AUTODIRDEP">
++ <option name="auto directory dependencies" type="boolean3" default="no" op="AUTODIRDEP">
+ <description>
+ RPM 4.4.6 introduces auto dependencies based on package directories.
+ Option controls this feature.
+--- poldek-0.21-cvs20070703.00/conf_sections.c~ 2007-06-30 10:42:33.000000000 +0300
++++ poldek-0.21-cvs20070703.00/conf_sections.c 2008-02-15 05:00:16.039094830 +0200
+@@ -205,7 +205,7 @@
+
+ { "auto directory dependencies",
+ CONF_TYPE_BOOLEAN3,
+- "auto",
++ "no",
+ POLDEK_OP_AUTODIRDEP, { 0 } },
+
+ { "follow",
diff --git a/poldek-multilib.conf b/poldek-multilib.conf
index ed83c79..1842647 100644
--- a/poldek-multilib.conf
+++ b/poldek-multilib.conf
@@ -1,51 +1,87 @@
# $Id$
# PLD Linux Distribution <http://www.pld-linux.org/>.
#
-# Alternative multilib sources for PLD Linux 3.0 (Th)
+# Alternative multilib sources for PLD Linux 2.0 (Ac)
_arch = %ARCH%
-_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
+_pld_main_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
## Some mirrors
## You can use them if you have better connection there
# CI TASK:
-#_prefix = ftp://ftp.task.pld-linux.org/dists/th
+#_prefix = ftp://ftp.task.pld-linux.org/dists/ac
_prefix = %{_pld_main_prefix}
-# group source for referring th+th-multiarch sources together, i.e poldek --sn th-all
+_type = pndir
+
[source]
-type = group
-name = th-all
-sources = th th-%{_arch}
+type = %{_type}
+name = ac-%{_arch}-main
+path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
+signed = yes
+pri = 2
+# msmtp-sendmail is broken, yum noarch is older than in updates and kernel we don't want
+ignore = msmtp-sendmail* yum* kernel*
+auto = no
+autoup = yes
[source]
-type = pndir
-name = th-%{_arch}
-path = %{_prefix}/PLD/%{_arch}/RPMS/
-ignore = kernel-*
+type = %{_type}
+name = ac-%{_arch}-updates
+path = %{_prefix}/updates/%{_arch}/
+ignore = kernel*
+signed = yes
+pri = 2
auto = no
-autoup = no
+autoup = yes
[source]
-type = pndir
-name = th-%{_arch}-obsolete
-path = %{_prefix}/obsolete/%{_arch}/RPMS/
-ignore = kernel-*
+type = %{_type}
+name = ac-%{_arch}-supported
+path = %{_prefix}/supported/%{_arch}/
+signed = yes
+ignore = kernel*
auto = no
autoup = no
[source]
-type = pndir
-name = th-%{_arch}-ready
-path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/
-ignore = kernel-*
+type = %{_type}
+name = ac-%{_arch}-ready
+path = %{_pld_main_prefix}/ready/%{_arch}/
+#signed = yes
auto = no
autoup = no
[source]
-type = pndir
-name = th-%{_arch}-test
-path = %{_pld_main_prefix}/test/%{_arch}/RPMS/
-ignore = kernel-*
+type = %{_type}
+name = ac-%{_arch}-test
+path = %{_pld_main_prefix}/test/%{_arch}/
auto = no
autoup = no
+
+# ac-ARCH-main + ac-ARCH-updates
+[source]
+type = group
+name = ac-%{_arch}
+sources = ac-%{_arch}-main ac-%{_arch}-updates
+
+# backward compatible aliases
+[source]
+type = group
+name = ac-updates-%{_arch}
+sources = ac-%{_arch}-ready
+
+[source]
+type = group
+name = ac-ready-%{_arch}
+sources = ac-%{_arch}-ready
+
+[source]
+type = group
+name = ac-supported-%{_arch}
+sources = ac-%{_arch}-supported
+
+[source]
+type = group
+name = ac-test-%{_arch}
+sources = ac-%{_arch}-test
diff --git a/poldek.conf b/poldek.conf
index bc51835..184577e 100644
--- a/poldek.conf
+++ b/poldek.conf
@@ -1,75 +1,68 @@
+# $Id$
# PLD Linux Distribution <http://www.pld-linux.org/>.
#
-# Main sources for PLD Linux 3.0 (Th)
+# Main sources for PLD Linux 2.0 (Ac)
# specify our packages architecture
_arch = %ARCH%
-# main PLD-site for often changed things (test, ready):
-_pld_main_prefix = ftp://ftp.th.pld-linux.org/dists/th
+# main PLD-site for often changed things:
+_pld_main_prefix = ftp://ftp.ac.pld-linux.org/dists/ac
## Some mirrors
## You can use them if you have better connection there
# CI TASK:
-#_prefix = ftp://ftp.task.pld-linux.org/dists/th
+#_prefix = ftp://ftp.task.pld-linux.org/dists/ac
_prefix = %{_pld_main_prefix}
-# PLD Linux 3.0 (Th): main sources
-[source]
-type = pndir
-name = th
-path = %{_prefix}/PLD/%{_arch}/RPMS/
-@@SNAP@@auto = no
-@@SNAP@@autoup = no
+_type = pndir
+# PLD Linux 2.0 (Ac)
[source]
-type = pndir
-name = th
-path = %{_prefix}/PLD/noarch/RPMS/
-@@SNAP@@auto = no
-@@SNAP@@autoup = no
+type = %{_type}
+name = ac-main
+path = %{_prefix}/PLD/%{_arch}/PLD/RPMS/
+signed = yes
+pri = 1
+# msmtp-sendmail is broken
+# yum.noarch is older than one in updates
+# rpm-build-tools.noarch in updates is newer
+# bzr.noarch is older in main
+# mediawiki arch pkgs get preferred over newer noarch from ac-updates
+ignore = msmtp-sendmail* yum* rpm-build-tools* bzr-* mediawiki-*
-# PLD Linux 3.0 (Th): obsolete sources (kde3, ...)
[source]
-type = pndir
-name = th-obsolete
-path = %{_prefix}/obsolete/%{_arch}/RPMS/
-auto = no
-autoup = no
+type = %{_type}
+name = ac-updates
+path = %{_prefix}/updates/%{_arch}/
+signed = yes
+pri = 1
[source]
-type = pndir
-name = th-obsolete
-path = %{_prefix}/obsolete/noarch/RPMS/
+type = %{_type}
+name = ac-supported
+path = %{_prefix}/supported/%{_arch}/
+signed = yes
auto = no
autoup = no
-# PLD Linux 3.0 (Th): ready sources (testing stage before moved to main)
[source]
-type = pndir
-name = th-ready
-path = %{_pld_main_prefix}/ready/%{_arch}/RPMS/
+type = %{_type}
+name = ac-ready
+path = %{_pld_main_prefix}/ready/%{_arch}/
+#signed = yes
auto = no
autoup = no
[source]
-type = pndir
-name = th-ready
-path = %{_pld_main_prefix}/ready/noarch/RPMS/
+type = %{_type}
+name = ac-test
+path = %{_pld_main_prefix}/test/%{_arch}/
auto = no
autoup = no
-# PLD Linux 3.0 (Th): test sources (built packages to be moved to ready)
+# ac-main + ac-updates
[source]
-type = pndir
-name = th-test
-path = %{_pld_main_prefix}/test/%{_arch}/RPMS/
-auto = no
-autoup = no
-
-[source]
-type = pndir
-name = th-test
-path = %{_pld_main_prefix}/test/noarch/RPMS/
-auto = no
-autoup = no
+type = group
+name = ac
+sources = ac-main ac-updates
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/da83ee7c9ef2410f6ae94a59bc6774bfaf06cfb5
More information about the pld-cvs-commit
mailing list