rpms/apt/devel apt.spec,1.26,1.27 default.conf,1.8,1.9
Axel Thimm (athimm)
fedora-extras-commits at redhat.com
Tue May 9 18:10:38 UTC 2006
- Previous message (by thread): rpms/perl-IO-Tty/devel .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3
- Next message (by thread): rpms/perl-IO-Tty/FC-5 .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: athimm
Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25654
Modified Files:
apt.spec default.conf
Log Message:
Prepare for splitting off config files (no tag/build yet!).
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- apt.spec 25 Apr 2006 18:47:24 -0000 1.26
+++ apt.spec 9 May 2006 18:10:38 -0000 1.27
@@ -6,7 +6,7 @@
Summary: Debian's Advanced Packaging Tool with RPM support
Name: apt
Version: 0.5.15lorg3
-Release: 1%{?dist}
+Release: 2%{?dist}
Group: System Environment/Base
URL: http://apt-rpm.laiskiainen.org/
License: GPL
@@ -32,20 +32,10 @@
Source50: preserve-conf.lua
Source51: upgradevirt.lua
-# 100-149 for sources.list.d
-Source100: fedora-core.list
-Source101: fedora-extras.list
-Source102: fedora-updates.list
-
# 150-199 for apt.conf.d
-# "factory defaults" for Fedora Core + Extras
+# "factory defaults"
Source150: default.conf
-# 200-249 for additional trusted gpg keys
-
-# 250-299 for vendor.list.d
-Source250: fedora-vendor.list
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# TODO: verify the required minimum Python version
@@ -75,6 +65,7 @@
%if 0%{!?_with_groupinstall:1}
Obsoletes: %{name}-groupinstall < %{version}-%{release}
%endif
+Requires: apt-config
%description
APT-RPM is a port of Debian's apt tools for RPM based distributions.
@@ -175,15 +166,8 @@
install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences
install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/
-# Default source list entries
-for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do
- install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/
-done
-
# install config parts
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/
@@ -250,12 +234,12 @@
%config(noreplace) %{_sysconfdir}/apt/rpmpriorities
%config(noreplace) %{_sysconfdir}/apt/sources.list
%config(noreplace) %{_sysconfdir}/apt/vendors.list
-# NOTE: no noreplace on *.d because we WANT to be able to change the defaults
-# without user intervention!
%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/
+# NOTE: no noreplace because we WANT to be able to change the defaults
+# without user intervention!
+%config %{_sysconfdir}/apt/apt.conf.d/defaults.conf
+%dir %{_sysconfdir}/apt/sources.list.d/
+%dir %{_sysconfdir}/apt/vendors.list.d/
%config(noreplace) %{_sysconfdir}/sysconfig/apt
%config %{_sysconfdir}/cron.daily/apt.cron
@@ -308,7 +292,10 @@
%changelog
-* Tue Apr 25 2006 Axel Thimm <thimm at neu.nirvana>
+* Mon May 8 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-2
+- Split off configuration files from apt.
+
+* Tue Apr 25 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.5.15lorg3-1
- Update to 0.5.15lorg3 final.
- Fix URL.
Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- default.conf 23 Mar 2006 06:33:58 -0000 1.8
+++ default.conf 9 May 2006 18:10:38 -0000 1.9
@@ -17,7 +17,6 @@
{
AllNames "false";
}
- DistroVerPkg "fedora-release";
};
RPM
@@ -55,7 +54,7 @@
// Options for the downloading routines
Acquire
{
- http::User-Agent "Fedora APT-HTTP/1.3";
+ http::User-Agent "APT-HTTP/1.3";
};
Scripts
- Previous message (by thread): rpms/perl-IO-Tty/devel .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3
- Next message (by thread): rpms/perl-IO-Tty/FC-5 .cvsignore, 1.2, 1.3 perl-IO-Tty.spec, 1.9, 1.10 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list