rpms/apt/devel .cvsignore, 1.4, 1.5 apt.spec, 1.18, 1.19 default.conf, 1.5, 1.6 sources, 1.4, 1.5 apt-0.5.15cnc5-manifest-limit.patch, 1.1, NONE apt-0.5.15cnc6-pymake2.patch, 1.1, NONE apt-0.5.15cnc6-rdonly.patch, 1.1, NONE apt-pymake.patch, 1.1, NONE apt-scriptdir.patch, 1.1, NONE apt-shell-155990.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Mar 19 20:52:50 UTC 2006
Author: scop
Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21164/devel
Modified Files:
.cvsignore apt.spec default.conf sources
Removed Files:
apt-0.5.15cnc5-manifest-limit.patch
apt-0.5.15cnc6-pymake2.patch apt-0.5.15cnc6-rdonly.patch
apt-pymake.patch apt-scriptdir.patch apt-shell-155990.patch
Log Message:
* Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.1.pre1
- 0.5.15lorg3-pre1: preliminary multilib and repomd support.
- Update config for kernel and module packages.
- Don't ship static libraries.
- Don't mark init script as config.
- Don't build -groupinstall for now.
- Clean up dependency lists for FC5+.
- Specfile cleanup.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 27 Mar 2005 12:08:38 -0000 1.4
+++ .cvsignore 19 Mar 2006 20:52:50 -0000 1.5
@@ -1 +1 @@
-apt-0.5.15cnc7.tar.bz2
+apt-0.5.15lorg3-pre1.tar.bz2
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- apt.spec 13 Nov 2005 14:52:50 -0000 1.18
+++ apt.spec 19 Mar 2006 20:52:50 -0000 1.19
@@ -1,165 +1,150 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define scriptdir %{_datadir}/apt/scripts/
-
%define generate_rpmpriorities 0
%define comps %{_datadir}/comps/%{_build_arch}/comps.xml
-Summary: Debian's Advanced Packaging Tool with RPM support
-Name: apt
-Version: 0.5.15cnc7
-Release: 7%{?dist}
-Group: System Environment/Base
-URL: https://moin.conectiva.com.br/AptRpm
-License: GPL
-ExcludeArch: x86_64 ppc64
-
-# unfortunately the source isn't really directly downloadable with wget etc:
-#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
-Source0: %{name}-%{version}.tar.bz2
+Summary: Debian's Advanced Packaging Tool with RPM support
+Name: apt
+Version: 0.5.15lorg3
+Release: 0.1.pre1%{?dist}
+Group: System Environment/Base
+URL: https://moin.conectiva.com.br/AptRpm
+License: GPL
+
+Source0: http://laiskiainen.org/apt/testing/apt-0.5.15lorg3-pre1.tar.bz2
# user editable template configs
-Source1: apt.conf
-Source2: sources.list
-Source3: vendors.list
-Source4: apt_preferences
+Source1: apt.conf
+Source2: sources.list
+Source3: vendors.list
+Source4: apt_preferences
# rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities
-Source19: comps2prio.xsl
+Source5: rpmpriorities
+Source19: comps2prio.xsl
# nightly updater scripts & config
-Source20: apt.init
-Source21: apt.cron
-Source22: apt.sysconfig
+Source20: apt.init
+Source21: apt.cron
+Source22: apt.sysconfig
# Sources 50-99 are for Lua-scripts not in contrib/
-#Source50:
-#Source51:
-Source52: preserve-conf.lua
-Source54: upgradevirt.lua
+Source50: preserve-conf.lua
+Source51: upgradevirt.lua
# 100-149 for sources.list.d
# no default entry for fedora at all
-#Source100: fedora.list
-#Source101: macromedia.list
# 150-199 for apt.conf.d
-# "factory defaults" for Fedora Core
-Source150: default.conf
+# "factory defaults" for Fedora Core + Extras
+Source150: default.conf
# 200-249 for trusted gpg keys
# Fedora key
-Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b
+Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b
# "Old" RHL key
-Source202: gpg-pubkey-db42a60e-37ea5438
+Source202: gpg-pubkey-db42a60e-37ea5438
# Fedora Extras key
-Source203: gpg-pubkey-1ac70ce6-41bebeef
+Source203: gpg-pubkey-1ac70ce6-41bebeef
# 250-299 for vendor.list.d
-Source250: fedora-vendor.list
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source250: fedora-vendor.list
-Provides: apt-mirrorselect
-
-# Other deps are automatically picked up by rpm
-Requires: gnupg, bzip2
-Requires(post): chkconfig, ldconfig
-Requires(preun): chkconfig
-# Needed by the mirror-selector script
-Requires: wget
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# TODO: verify the required minimum Python version
-BuildRequires: python-devel >= 2.2
-BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
+BuildRequires: python-devel >= 2.2
+BuildRequires: libxml2-devel
+BuildRequires: rpm-devel
+BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: libstdc++-devel
+BuildRequires: gettext
+BuildRequires: docbook-utils
+BuildRequires: perl
+BuildRequires: readline-devel
+BuildRequires: ncurses-devel
%if %{generate_rpmpriorities}
-BuildRequires: %{_bindir}/xsltproc, %{comps}
+BuildRequires: %{_bindir}/xsltproc
+BuildRequires: %{comps}
+%endif
+# libxml2-devel, #183689
+BuildRequires: pkgconfig
+Requires: gnupg
+Requires: bzip2
+# wget needed by the mirror-selector script
+Requires: wget
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+Provides: apt-mirrorselect
+%if 0%{!?_with_groupinstall:1}
+Obsoletes: %{name}-groupinstall < %{version}-%{release}
%endif
-# Work around missing deps in rpm-devel :-/
-BuildRequires: beecrypt-devel, elfutils-libelf-devel
-
-Patch0: apt-shell-155990.patch
-# Fix some issues in python binding build
-Patch1: apt-pymake.patch
-Patch5: apt-0.5.15cnc6-pymake2.patch
-# Make rpm manifest usage configurable
-Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Take read-only, not exclusive rpmdb lock for the initial dependency processing
-Patch6: apt-0.5.15cnc6-rdonly.patch
-# Move scripts from /usr/lib/apt to /usr/share/apt
-Patch7: apt-scriptdir.patch
%description
-A port of Debian's apt tools for RPM based distributions.
-It provides the apt-get utility that provides a simpler, safer way to
-install and upgrade packages. APT features complete installation ordering,
-multiple source capability and several other unique features.
-
-%package devel
-Summary: Development files and documentation for APT's libapt-pkg.
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: rpm-devel
-%description devel
-This package contains the header files and static libraries for developing
-with APT's libapt-pkg package manipulation library, modified for RPM.
-
-%package python
-Summary: Python bindings for libapt-pkg
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-%description python
+APT-RPM is a port of Debian's apt tools for RPM based distributions.
+It provides the apt-get utility that provides a simple, safe way to
+install and upgrade packages. APT features complete installation
+ordering, multiple source capability and several other useful
+features.
+
+%package devel
+Summary: Development files and documentation for APT's libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: rpm-devel
+
+%description devel
+This package contains development files for developing with APT's
+libapt-pkg package manipulation library, modified for RPM.
+
+%package python
+Summary: Python bindings for libapt-pkg
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description python
The apt-python package contains a module which allows python programs
to access the APT library interface.
-%package groupinstall
-Summary: Add commands to install and remove package groups.
-Group: System Environment/Base
-Requires: %{name} = %{version}-%{release}
-Requires: rhpl, comps
-%description groupinstall
-This package adds four new commands to apt for installing, removing and viewing
-groups of packages:
+%package groupinstall
+Summary: Additional commands to install and remove package groups
+Group: System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: rhpl
+Requires: comps
+
+%description groupinstall
+This package adds four new commands to apt for installing, removing
+and viewing groups of packages:
apt-cache groupnames
apt-cache showgroup <groupname> [<groupname2> ..]
apt-get groupinstall <groupname> [<groupname2> ..]
apt-get groupremove <groupname> [<groupname2> ..]
-The group information is retrieved from comps.xml used by anaconda (the
-system installer) and other package management tools of RHL/RHEL/FC
-distributions.
+The group information is retrieved from comps.xml used by anaconda
+(the system installer) and other package management tools of
+RHL/RHEL/FC distributions.
%prep
-%setup -q
-%patch0 -p0 -b .155990
-%patch1 -p0 -b .pymake
-%patch3 -p1 -b .manifest
-%patch5 -p0 -b .pymake2
-%patch6 -p1 -b .rdonly
-%patch7 -p0 -b .scriptdir
+%setup -q -n %{name}-%{version}-pre1
# fix docs to reference correct paths
perl -pi -e \
's|\bconfigure-index\.gz\b|configure-index| ;
s|/usr/share/doc/apt/|%{_docdir}/%{name}-%{version}/|' \
- doc/apt.ent doc/*/apt.ent.*
+ doc/apt.ent doc/*/apt.ent.* doc/offline.sgml contrib/apt-wrapper/apt.ent
install -pm 644 %{SOURCE19} comps2prio.xsl
# don't require python, lua etc because of stuff in doc/contrib
find contrib/ -type f | xargs chmod 0644
-# appease aclocal >= 1.8
-perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4
-
-# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html
-libtoolize -f && autoreconf
-
%build
-%configure --disable-dependency-tracking
+%configure --disable-dependency-tracking --disable-static
SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
make %{?_smp_mflags}
@@ -176,7 +161,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall includedir=$RPM_BUILD_ROOT%{_includedir}/apt-pkg
+make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg
%find_lang %{name}
# The state files
@@ -190,104 +175,108 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
-install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf
+install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list
+install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list
+install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
+install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
# install config parts
-install -p -m 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
-install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
+install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
+install -pm 644 %{SOURCE250} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
# GPG keys
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
-for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203}; do
- install -p -m 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
+for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do
+ install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
done
# Lua scripts
-mkdir -p $RPM_BUILD_ROOT%{scriptdir}
-for script in %{SOURCE52} %{SOURCE54}; do
- install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
+for script in %{SOURCE50} %{SOURCE51} ; do
+ install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
done
# The python bindings
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/
-install -p -m 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
-install -p -m 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/
+install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/
+install -pm 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/
touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
# Nightly updater scripts & default config
-install -D -p -m 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt
-install -D -p -m 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
-install -D -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
+install -Dpm 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt
+install -Dpm 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
# GPG checker from contrib
-install -p -m 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{scriptdir}/
+install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
# apt-groupinstall from contrib
-install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir}
-install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+%if 0%{?_with_groupinstall:1}
+install -pm 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
+touch $RPM_BUILD_ROOT%{_datadir}/apt/scripts/groupinstall-backend-comps.py{c,o}
+install -pm 644 contrib/apt-groupinstall/apt-groupinstall.conf \
+ $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+%endif
# nuke .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
%pre
if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
- mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave
- echo "NOTE: Default configuration changed!"
- echo "If you have made any changes to the configuration locally"
- echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave"
- echo "to %{_sysconfdir}/apt/apt.conf"
+ mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave
+ echo "NOTE: Default configuration changed!"
+ echo "If you have made any changes to the configuration locally,"
+ echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave"
+ echo "to %{_sysconfdir}/apt/apt.conf"
fi
-%preun
-if [ $1 = 0 ]; then
- /sbin/service apt stop > /dev/null 2>&1
- /sbin/chkconfig --del apt
-fi
-exit 0
-
%post
/sbin/ldconfig
-if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
- echo "// User customizable configuration goes here" \
+if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then
+ echo "// User customizable configuration goes here" \
> %{_sysconfdir}/apt/apt.conf
fi
/sbin/chkconfig --add apt
-%postun -p /sbin/ldconfig
+%preun
+if [ $1 -eq 0 ] ; then
+ %{_initrddir}/apt stop &>/dev/null || :
+ /sbin/chkconfig --del apt
+fi
-%clean
-rm -rf $RPM_BUILD_ROOT
+%postun -p /sbin/ldconfig
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/
-%dir %{_sysconfdir}/apt
-%dir %{_sysconfdir}/apt/sources.list.d
-%dir %{_sysconfdir}/apt/vendors.list.d
-%dir %{_sysconfdir}/apt/apt.conf.d
-%dir %{_sysconfdir}/apt/gpg
-%{_sysconfdir}/apt/gpg/gpg-pubkey*
-%config(noreplace) %{_sysconfdir}/sysconfig/apt
-%config(noreplace) %{_sysconfdir}/apt/rpmpriorities
-%config(noreplace) %{_sysconfdir}/apt/preferences
+
+%dir %{_sysconfdir}/apt/
%config(noreplace) %{_sysconfdir}/apt/apt.conf
+%config(noreplace) %{_sysconfdir}/apt/preferences
+%config(noreplace) %{_sysconfdir}/apt/rpmpriorities
%config(noreplace) %{_sysconfdir}/apt/sources.list
%config(noreplace) %{_sysconfdir}/apt/vendors.list
-# NOTE: no noreplace on these because we WANT to be able to change the defaults
+# NOTE: no noreplace on *.d because we WANT to be able to change the defaults
# without user intervention!
-%config %{_sysconfdir}/apt/apt.conf.d/*
-%exclude %{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf
-#%config %{_sysconfdir}/apt/sources.list.d/*.list
-%config %{_sysconfdir}/apt/vendors.list.d/*
-%config %{_initrddir}/apt
+%dir %{_sysconfdir}/apt/apt.conf.d/
+%config %{_sysconfdir}/apt/apt.conf.d/default.conf
+%config %{_sysconfdir}/apt/sources.list.d/
+%config %{_sysconfdir}/apt/vendors.list.d/
+
+%config(noreplace) %{_sysconfdir}/sysconfig/apt
%config %{_sysconfdir}/cron.daily/apt.cron
+%{_sysconfdir}/apt/gpg/
+%{_initrddir}/apt
+
%{_bindir}/apt-cache
%{_bindir}/apt-cdrom
%{_bindir}/apt-config
@@ -297,36 +286,51 @@
%{_bindir}/genpkglist
%{_bindir}/gensrclist
%{_bindir}/genbasedir
-%{_libdir}/*.so.*
-%{_libdir}/apt
-%{_datadir}/apt
-%exclude %{scriptdir}/apt-groupinstall.lua
-%exclude %{scriptdir}/groupinstall-backend-comps.py
-%{_mandir}/man?/*
-%{_localstatedir}/cache/apt
-%{_localstatedir}/state/apt
+%{_libdir}/libapt-pkg*.so.*
+%{_libdir}/apt/
+%dir %{_datadir}/apt/
+%dir %{_datadir}/apt/scripts/
+%{_datadir}/apt/scripts/gpg-check.lua
+%{_datadir}/apt/scripts/gpg-import.lua
+%{_datadir}/apt/scripts/preserve-conf.lua
+%{_datadir}/apt/scripts/upgradevirt.lua
+%{_localstatedir}/cache/apt/
+%{_localstatedir}/state/apt/
+%{_mandir}/man[58]/*.[58]*
%files devel
-%defattr(-, root, root)
+%defattr(-,root,root,-)
%{_includedir}/apt-pkg/
-%{_libdir}/*.so
-%{_libdir}/*.a
+%{_libdir}/libapt-pkg*.so
%files python
-%defattr(-, root, root)
+%defattr(-,root,root,-)
%{python_sitearch}/_apt.so
%{python_sitearch}/apt.py
%{python_sitearch}/apt.pyc
%ghost %{python_sitearch}/apt.pyo
+%if 0%{?_with_groupinstall:1}
%files groupinstall
-%defattr(-, root, root)
+%defattr(-,root,root,-)
+# XXX not config?
%{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf
-%{scriptdir}/apt-groupinstall.lua
-%{scriptdir}/groupinstall-backend-comps.py
+%{_datadir}/apt/scripts/apt-groupinstall.lua
+%{_datadir}/apt/scripts/groupinstall-backend-comps.py
+%ghost %{_datadir}/apt/scripts/groupinstall-backend-comps.py[co]
+%endif
%changelog
+* Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.1.pre1
+- 0.5.15lorg3-pre1: preliminary multilib and repomd support.
+- Update config for kernel and module packages.
+- Don't ship static libraries.
+- Don't mark init script as config.
+- Don't build -groupinstall for now.
+- Clean up dependency lists for FC5+.
+- Specfile cleanup.
+
* Sun Nov 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15cnc7-7
- Rebuild against new OpenSSL.
Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.conf 18 Feb 2005 22:14:10 -0000 1.5
+++ default.conf 19 Mar 2006 20:52:50 -0000 1.6
@@ -26,9 +26,19 @@
// Completely ignore GnuPG signature packages (introduced in rpm 4.1)
Ignore { "gpg-pubkey"; };
// Allow multiple kernel and kernel-related packages to be installed
- Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; "^gpg-pubkey$"; };
+ Allow-Duplicated {
+ "^kernel(-(hugemem|kdump|smp|xen[0U]))(-devel)?$";
+ "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))$";
+ "^kmod-.+$";
+ "^gpg-pubkey$";
+ };
// XXX: not used currently
- //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; };
+ //Allow-Duplicated-Upgrade {
+ // "^kernel(-(hugemem|kdump|smp|xen[0U]))(-devel)?$";
+ // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))$";
+ // "^kmod-.+$";
+ // "^gpg-pubkey$";
+ //};
// "Upgrade" allow-duplicated packages as well
Upgrade-Virtual "true";
// Enable source rebuilds
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 27 Mar 2005 12:08:38 -0000 1.4
+++ sources 19 Mar 2006 20:52:50 -0000 1.5
@@ -1 +1 @@
-9e44ec1503fa96832bbd9b532543e4de apt-0.5.15cnc7.tar.bz2
+5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2
--- apt-0.5.15cnc5-manifest-limit.patch DELETED ---
--- apt-0.5.15cnc6-pymake2.patch DELETED ---
--- apt-0.5.15cnc6-rdonly.patch DELETED ---
--- apt-pymake.patch DELETED ---
--- apt-scriptdir.patch DELETED ---
--- apt-shell-155990.patch DELETED ---
More information about the fedora-extras-commits
mailing list