rpms/apt/devel .cvsignore, 1.10, 1.11 apt.spec, 1.28, 1.29 default.conf, 1.9, 1.10 sources, 1.10, 1.11
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Sat May 20 16:55:17 UTC 2006
Author: athimm
Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25451/apt/devel
Modified Files:
.cvsignore apt.spec default.conf sources
Log Message:
Upgrade apt to latest rc, move some config bits from apt to f-p-c-a.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 25 Apr 2006 18:47:24 -0000 1.10
+++ .cvsignore 20 May 2006 16:55:17 -0000 1.11
@@ -1 +1 @@
-apt-0.5.15lorg3.tar.bz2
+apt-0.5.15lorg3.1-rc2.tar.bz2
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apt.spec 11 May 2006 21:19:47 -0000 1.28
+++ apt.spec 20 May 2006 16:55:17 -0000 1.29
@@ -5,13 +5,14 @@
Summary: Debian's Advanced Packaging Tool with RPM support
Name: apt
-Version: 0.5.15lorg3
-Release: 2.1%{?dist}
+Version: 0.5.15lorg3.1
+Release: 3_rc2%{?dist}
Group: System Environment/Base
URL: http://apt-rpm.laiskiainen.org/
License: GPL
-Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+#Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
+Source0: http://apt-rpm.org/testing/%{name}-%{version}-rc2.tar.bz2
# user editable template configs
Source1: apt.conf
@@ -23,13 +24,7 @@
Source5: rpmpriorities
Source19: comps2prio.xsl
-# nightly updater scripts & config
-Source20: apt.init
-Source21: apt.cron
-Source22: apt.sysconfig
-
# Sources 50-99 are for Lua-scripts not in contrib/
-Source50: preserve-conf.lua
Source51: upgradevirt.lua
# 150-199 for apt.conf.d
@@ -114,7 +109,7 @@
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-rc2
# fix docs to reference correct paths
perl -pi -e \
@@ -178,7 +173,7 @@
# Lua scripts
mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
-for script in %{SOURCE50} %{SOURCE51} ; do
+for script in %{SOURCE51} ; do
install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts
done
@@ -189,9 +184,9 @@
touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo
# Nightly updater scripts & default config
-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
+install -Dpm 755 contrib/apt-cron/apt.init $RPM_BUILD_ROOT/%{_initrddir}/apt
+install -Dpm 755 contrib/apt-cron/apt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron
+install -Dpm 644 contrib/apt-cron/apt.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt
# GPG checker from contrib
install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts
@@ -262,7 +257,6 @@
%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}/lib/apt/
@@ -292,6 +286,11 @@
%changelog
+* Sat May 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net>
+- Update to 0.5.15lorg3.1-rc2.
+- Move some FC specific config bits to fedora-package-config-apt.
+- Remove some sources that can be found in upstream now.
+
* Thu May 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-2.1
- Remove bogus final s from default(s).conf (Ville).
Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- default.conf 9 May 2006 18:10:38 -0000 1.9
+++ default.conf 20 May 2006 16:55:17 -0000 1.10
@@ -9,43 +9,12 @@
// Options for apt-get
Get
{
- Download-Only "false";
- Show-Upgraded "true";
Show-Versions "true";
- };
- Cache
- {
- AllNames "false";
- }
+ }
};
RPM
{
- // Use rpm's ordering, not apt's (which is incorrect for FHL/FC upgrades)
- Order "true";
- // 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(-(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(-(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
- Source
- {
- Build-Command "rpmbuild --rebuild";
- };
// Always check GPG keys and automatically import new ones
GPG-Check "true";
GPG-Import "true";
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 25 Apr 2006 18:47:24 -0000 1.10
+++ sources 20 May 2006 16:55:17 -0000 1.11
@@ -1 +1 @@
-167cfdf8dea5eb1a9873a53ff546bf6a apt-0.5.15lorg3.tar.bz2
+8194eb59fb5fc0fe2680ab4272a3dc04 apt-0.5.15lorg3.1-rc2.tar.bz2
More information about the fedora-extras-commits
mailing list