rpms/apt/devel fedora-core.list, NONE, 1.1 fedora-extras.list, NONE, 1.1 fedora-updates.list, NONE, 1.1 .cvsignore, 1.5, 1.6 apt.spec, 1.20, 1.21 default.conf, 1.7, 1.8 sources, 1.5, 1.6 gpg-pubkey-1ac70ce6-41bebeef, 1.1, NONE gpg-pubkey-4f2a6fd2-3f9d9d3b, 1.1, NONE gpg-pubkey-db42a60e-37ea5438, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Mar 23 06:33:58 UTC 2006
Author: scop
Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26963
Modified Files:
.cvsignore apt.spec default.conf sources
Added Files:
fedora-core.list fedora-extras.list fedora-updates.list
Removed Files:
gpg-pubkey-1ac70ce6-41bebeef gpg-pubkey-4f2a6fd2-3f9d9d3b
gpg-pubkey-db42a60e-37ea5438
Log Message:
* Wed Mar 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre2
- Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead.
- Don't import the "Old RHL key" by default.
* Wed Mar 22 2006 Panu Matilainen <pmatilai at laiskiainen.org>
- 0.5.15lorg333-pre2
- set distroverpkg to fedora-release
- add distro version and arch independent default source list entries for
fedora core, extras + updates
- remove old nasty fedora.us-time hacks from post scriptlets
--- NEW FILE fedora-core.list ---
# Fedora Core
repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/os/
# Debug packages
# repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/debug/
# sources
#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/source/SRPMS/
--- NEW FILE fedora-extras.list ---
# Fedora Extras
repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/
# Debug packages
# repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/debug/
# Sources
#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/SRPMS/
--- NEW FILE fedora-updates.list ---
# Fedora Core
repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/
# Debug packages
#repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/debug/
# sources
#repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/SRPMS/
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Mar 2006 20:52:50 -0000 1.5
+++ .cvsignore 23 Mar 2006 06:33:58 -0000 1.6
@@ -1 +1 @@
-apt-0.5.15lorg3-pre1.tar.bz2
+apt-0.5.15lorg3-pre2.tar.bz2
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apt.spec 19 Mar 2006 21:21:54 -0000 1.20
+++ apt.spec 23 Mar 2006 06:33:58 -0000 1.21
@@ -6,12 +6,12 @@
Summary: Debian's Advanced Packaging Tool with RPM support
Name: apt
Version: 0.5.15lorg3
-Release: 0.2.pre1%{?dist}
+Release: 0.2.pre2%{?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
+Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}-pre2.tar.bz2
# user editable template configs
Source1: apt.conf
@@ -33,19 +33,15 @@
Source51: upgradevirt.lua
# 100-149 for sources.list.d
-# no default entry for fedora at all
+Source100: fedora-core.list
+Source101: fedora-extras.list
+Source102: fedora-updates.list
# 150-199 for apt.conf.d
# "factory defaults" for Fedora Core + Extras
Source150: default.conf
-# 200-249 for trusted gpg keys
-# Fedora key
-Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b
-# "Old" RHL key
-Source202: gpg-pubkey-db42a60e-37ea5438
-# Fedora Extras key
-Source203: gpg-pubkey-1ac70ce6-41bebeef
+# 200-249 for additional trusted gpg keys
# 250-299 for vendor.list.d
Source250: fedora-vendor.list
@@ -74,6 +70,7 @@
Requires: bzip2
# wget needed by the mirror-selector script
Requires: wget
+Requires: fedora-release >= 5
Requires(post): chkconfig
Requires(post): ldconfig
Requires(preun): chkconfig
@@ -129,7 +126,7 @@
%prep
-%setup -q -n %{name}-%{version}-pre1
+%setup -q -n %{name}-%{version}-pre2
# fix docs to reference correct paths
perl -pi -e \
@@ -181,6 +178,11 @@
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} \
@@ -188,9 +190,10 @@
# GPG keys
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
-for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do
- install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/
-done
+ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \
+ $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-4f2a6fd2-3f9d9d3b
+ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras \
+ $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/gpg-pubkey-1ac70ce6-41bebeef
# Lua scripts
mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts
@@ -227,22 +230,8 @@
%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"
-fi
-
%post
/sbin/ldconfig
-if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then
- echo "// User customizable configuration goes here" \
- > %{_sysconfdir}/apt/apt.conf
-fi
/sbin/chkconfig --add apt
%preun
@@ -322,6 +311,17 @@
%changelog
+* Wed Mar 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre2
+- Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead.
+- Don't import the "Old RHL key" by default.
+
+* Wed Mar 22 2006 Panu Matilainen <pmatilai at laiskiainen.org>
+- 0.5.15lorg3-pre2
+- set distroverpkg to fedora-release
+- add distro version and arch independent default source list entries for
+ fedora core, extras + updates
+- remove old nasty fedora.us-time hacks from post scriptlets
+
* Sun Mar 19 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre1
- Fix Allow-Duplicated* default.conf bugs introduced in previous version.
Index: default.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/default.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- default.conf 19 Mar 2006 21:21:54 -0000 1.7
+++ default.conf 23 Mar 2006 06:33:58 -0000 1.8
@@ -17,6 +17,7 @@
{
AllNames "false";
}
+ DistroVerPkg "fedora-release";
};
RPM
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 Mar 2006 20:52:50 -0000 1.5
+++ sources 23 Mar 2006 06:33:58 -0000 1.6
@@ -1 +1 @@
-5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2
+530456d62eb62d980ebb0d057260a7f1 apt-0.5.15lorg3-pre2.tar.bz2
--- gpg-pubkey-1ac70ce6-41bebeef DELETED ---
--- gpg-pubkey-4f2a6fd2-3f9d9d3b DELETED ---
--- gpg-pubkey-db42a60e-37ea5438 DELETED ---
More information about the fedora-extras-commits
mailing list