rpms/apt/FC-3 apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE, 1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec, 1.9, 1.10 mirror-select.conf, 1.3, 1.4 sources, 1.3, 1.4 apt-0.5.15cnc6-docbook.patch, 1.1, NONE apt-0.5.15cnc6-pymake.patch, 1.2, NONE apt-0.5.15cnc6-python-update.patch, 1.1, NONE apt-0.5.15cnc6-r362.patch, 1.1, NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua, 1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3, NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1, NONE rpmpriorities.Rawhide, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Mar 27 12:10:15 UTC 2005
- Previous message (by thread): rpms/apt/devel apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE, 1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec, 1.12, 1.13 mirror-select.conf, 1.3, 1.4 sources, 1.3, 1.4 apt-0.5.15cnc6-docbook.patch, 1.1, NONE apt-0.5.15cnc6-pymake.patch, 1.2, NONE apt-0.5.15cnc6-python-update.patch, 1.1, NONE apt-0.5.15cnc6-r362.patch, 1.1, NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua, 1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3, NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1, NONE rpmpriorities.Rawhide, 1.1, NONE
- Next message (by thread): rpms/apt/devel rpmpriorities,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/apt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25731
Modified Files:
.cvsignore apt.spec mirror-select.conf sources
Added Files:
apt-pymake.patch apt-scriptdir.patch rpmpriorities
Removed Files:
apt-0.5.15cnc6-docbook.patch apt-0.5.15cnc6-pymake.patch
apt-0.5.15cnc6-python-update.patch apt-0.5.15cnc6-r362.patch
apt-0.5.15cnc6-scriptdir.patch gpg-checker.lua gpg-import.lua
rpmpriorities.1 rpmpriorities.2 rpmpriorities.3
rpmpriorities.Rawhide
Log Message:
0.5.15cnc7, perms fix, whitespace/cleanup sync w/devel, drop non-FC3 stuff.
apt-pymake.patch:
--- NEW FILE apt-pymake.patch ---
Index: python/Makefile
===================================================================
--- python/Makefile (revision 373)
+++ python/Makefile (working copy)
@@ -16,10 +16,10 @@
$(MODULES): %.py: _%.so
_%.so: %_wrap.cxx
- $(CC) -fPIC -shared -I.. $(PYTHONFLAGS) $(LUAFLAGS) -L../bin -L../build/bin -lapt-pkg -o $@ $<
+ $(CC) -fPIC -shared -I.. -I../include $(PYTHONFLAGS) $(LUAFLAGS) -L../apt-pkg/.libs -lapt-pkg -o $@ $<
apt_wrap.cxx: apt.i
- $(SWIG) $(SWIGFLAGS) -c++ -I.. $(LUAFLAGS) -python $<
+ $(SWIG) $(SWIGFLAGS) -c++ -I.. -I../include $(LUAFLAGS) -python $<
clean:
rm -f *.cxx
apt-scriptdir.patch:
--- NEW FILE apt-scriptdir.patch ---
Index: contrib/apt-wrapper/apt.1.xml
===================================================================
--- contrib/apt-wrapper/apt.1.xml (revision 373)
+++ contrib/apt-wrapper/apt.1.xml (working copy)
@@ -325,7 +325,7 @@
<refsect1><title>Files</title>
<variablelist>
- <varlistentry><term><filename>/usr/lib/apt/scripts</filename></term>
+ <varlistentry><term><filename>/usr/share/apt/scripts</filename></term>
<listitem><para>APT lua scripts.
Configuration item: <literal>Dir::Bin::scripts</literal>.</para></listitem>
</varlistentry>
Index: contrib/apt-wrapper/apt.1
===================================================================
--- contrib/apt-wrapper/apt.1 (revision 373)
+++ contrib/apt-wrapper/apt.1 (working copy)
@@ -157,7 +157,7 @@
.SH "FILES"
.TP
-\fI/usr/lib/apt/scripts\fR
+\fI/usr/share/apt/scripts\fR
APT lua scripts\&. Configuration item: Dir::Bin::scripts\&.
.SH "ENVIRONMENT"
Index: contrib/apt-files/README
===================================================================
--- contrib/apt-files/README (revision 373)
+++ contrib/apt-files/README (working copy)
@@ -40,7 +40,7 @@
these files in the following directories:
/etc/apt/apt.conf.d/apt-files.conf
- /usr/lib/apt/scripts/apt-files.lua
+ /usr/share/apt/scripts/apt-files.lua
/var/state/apt/Contents.gz
Bingo! It should be working. ;-)
Index: contrib/apt-groupinstall/apt-groupinstall.conf
===================================================================
--- contrib/apt-groupinstall/apt-groupinstall.conf (revision 373)
+++ contrib/apt-groupinstall/apt-groupinstall.conf (working copy)
@@ -10,7 +10,7 @@
// For RHEL/FC systems
Scripts::Groupinstall::Backend "groupinstall-backend-comps.py";
Scripts::Groupinstall::DataPath "/usr/share/comps/i386/comps.xml";
-Synaptic::taskHelperProg "/usr/lib/apt/scripts/groupinstall-backend-comps.py";
+Synaptic::taskHelperProg "/usr/share/apt/scripts/groupinstall-backend-comps.py";
// For Suse systems
//Scripts::Groupinstall::Backend "groupinstall-backend-suse";
Index: apt-pkg/luaiface.cc
===================================================================
--- apt-pkg/luaiface.cc (revision 373)
+++ apt-pkg/luaiface.cc (working copy)
@@ -76,7 +76,7 @@
Lua::Lua()
: DepCache(0), Cache(0), CacheControl(0), Fix(0), DontFix(0)
{
- _config->CndSet("Dir::Bin::scripts", "/usr/lib/apt/scripts");
+ _config->CndSet("Dir::Bin::scripts", "/usr/share/apt/scripts");
const luaL_reg lualibs[] = {
{"base", luaopen_base},
Index: rpmpriorities
===================================================================
RCS file: rpmpriorities
diff -N rpmpriorities
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ rpmpriorities 27 Mar 2005 12:10:13 -0000 1.3
@@ -0,0 +1,37 @@
+Essential:
+ grub
+ termcap
+ ed
+ kbd
+ iproute
+ libtermcap
+ libgcc
+ setserial
+ file
+ rpm
+ sysklogd
+ losetup
+ kudzu
+ glibc
+ shadow-utils
+ coreutils
+ bash
+ iputils
+ vim-minimal
+ passwd
+ cpio
+ raidtools
+ SysVinit
+ authconfig
+ hdparm
+ hotplug
+ readline
+ util-linux
+ basesystem
+ setup
+ e2fsprogs
+ procps
+ initscripts
+ filesystem
+ fedora-release
+ udev
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 8 Nov 2004 04:04:37 -0000 1.3
+++ .cvsignore 27 Mar 2005 12:10:13 -0000 1.4
@@ -1 +1 @@
-apt-0.5.15cnc6.tar.bz2
+apt-0.5.15cnc7.tar.bz2
Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/apt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apt.spec 18 Feb 2005 22:14:10 -0000 1.9
+++ apt.spec 27 Mar 2005 12:10:13 -0000 1.10
@@ -1,6 +1,3 @@
-# needed for rpmpriorities and mirror-select.conf:
-%{!?fcrel:%define fcrel %(cut -d' ' -f4 /etc/fedora-release )}
-
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%define scriptdir %{_datadir}/apt/scripts/
@@ -8,16 +5,10 @@
%define generate_rpmpriorities 0
%define comps %{_datadir}/comps/%{_build_arch}/comps.xml
-# subversion revision for svn snapshots
-%define svnver r362
-
-# we need to work around various missing builddeps in rpm :-/
-%{!?rpmver:%define rpmver %(rpm --version | cut -d' ' -f3 | cut -d. -f1-2)}
-
-Summary: Debian's Advanced Packaging Tool with RPM support.
+Summary: Debian's Advanced Packaging Tool with RPM support
Name: apt
-Version: 0.5.15cnc6
-Release: 16.%{svnver}
+Version: 0.5.15cnc7
+Release: 1
Epoch: 0
Group: System Environment/Base
URL: https://moin.conectiva.com.br/AptRpm
@@ -25,7 +16,7 @@
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.15cnc6.tar.bz2
+#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2
Source0: %{name}-%{version}.tar.bz2
# user editable template configs
@@ -35,10 +26,7 @@
Source4: apt_preferences
# rpmpriorities generated + manually tweaked from comps.xml core group
-Source5: rpmpriorities.1
-Source6: rpmpriorities.2
-Source6: rpmpriorities.3
-Source18: rpmpriorities.Rawhide
+Source5: rpmpriorities
Source19: comps2prio.xsl
# nightly updater scripts & config
@@ -79,49 +67,37 @@
Provides: apt-mirrorselect
-# Others deps are automatically picked up by rpm
+# 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
-BuildRequires: beecrypt-devel
-BuildRequires: elfutils-devel
-# TODO: verify the required minimum version
+# TODO: verify the required minimum Python version
BuildRequires: python-devel >= 0:2.2
BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext
-BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel
-# for version detection to work
-BuildRequires: fedora-release
+BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool
%if %{generate_rpmpriorities}
BuildRequires: %{_bindir}/xsltproc, %{comps}
%endif
-
-%if "%{rpmver}" == "4.3"
-BuildRequires: libselinux-devel
-%endif
+# Work around missing deps in rpm-devel :-/
+BuildRequires: beecrypt-devel, elfutils-libelf-devel, libselinux-devel
# Fix some issues in python binding build
-Patch1: apt-0.5.15cnc6-pymake.patch
+Patch1: apt-pymake.patch
Patch5: apt-0.5.15cnc6-pymake2.patch
-# Update to current svn snapshot: svn diff -r316:%{svnver}
-Patch2: apt-0.5.15cnc6-%{svnver}.patch
# Make rpm manifest usage configurable
Patch3: apt-0.5.15cnc5-manifest-limit.patch
-# Docbook build fixes, send upstream
-Patch4: apt-0.5.15cnc6-docbook.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-0.5.15cnc6-scriptdir.patch
-# Update python bindings
-Patch8: apt-0.5.15cnc6-python-update.patch
+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,
+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
@@ -156,47 +132,48 @@
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
+system installer) and other package management tools of RHL/RHEL/FC
distributions.
%prep
%setup -q
-%patch1 -p1 -b .pymake
-%patch2 -p0 -b .svnsnap
+%patch1 -p0 -b .pymake
%patch3 -p1 -b .manifest
-%patch4 -p0 -b .docbook
%patch5 -p0 -b .pymake2
%patch6 -p1 -b .rdonly
-%patch7 -p1 -b .scriptdir
-%patch8 -p1 -b .pyupdate
+%patch7 -p0 -b .scriptdir
# 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/fr/apt.ent.fr
+ doc/apt.ent doc/*/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
SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \
-make %{?_smp_mflags}
+make %{?_smp_mflags}
-# prevent re-generation of the python wrapper, requires a patched swig :(
-#touch python/apt.py python/apt_wrap.cxx
-cp python/apt.py python/apt.py.pyupdate
-cp python/apt_wrap.cxx python/apt_wrap.cxx.pyupdate
make -C python %{?_smp_mflags} PYTHON="%{__python}"
%{__python} -c "import py_compile; py_compile.compile('python/apt.py')"
+cp -p %{SOURCE5} rpmpriorities
%if %{generate_rpmpriorities}
%{_bindir}/xsltproc -o rpmpriorities comps2prio.xsl %{comps}
-%else
-cp -p $RPM_SOURCE_DIR/rpmpriorities.%{fcrel} rpmpriorities
%endif
@@ -227,8 +204,6 @@
for cnf in %{SOURCE150} %{SOURCE151}; do
install -p -m 644 $cnf $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/
done
-# fix mirror-select path
-perl -pi -e "s/FCREL/%{fcrel}/g" $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/mirror-select.conf
install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list
@@ -260,14 +235,11 @@
# 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 755 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
+install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/
# nuke .la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-# don't require python, lua etc because of stuff in doc/contrib
-find contrib/ -type f |xargs chmod 0644
-
%pre
if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then
@@ -285,10 +257,11 @@
fi
exit 0
-%post
+%post
/sbin/ldconfig
if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then
- echo "// User customizable configuration goes here" > %{_sysconfdir}/apt/apt.conf
+ echo "// User customizable configuration goes here" \
+ > %{_sysconfdir}/apt/apt.conf
fi
/sbin/chkconfig --add apt
@@ -310,7 +283,7 @@
%config(noreplace) %{_sysconfdir}/sysconfig/apt
%config(noreplace) %{_sysconfdir}/apt/rpmpriorities
%config(noreplace) %{_sysconfdir}/apt/preferences
-%config(noreplace) %{_sysconfdir}/apt/apt.conf
+%config(noreplace) %{_sysconfdir}/apt/apt.conf
%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
@@ -327,6 +300,7 @@
%{_bindir}/apt-config
%{_bindir}/apt-shell
%{_bindir}/apt-get
+%{_bindir}/countpkglist
%{_bindir}/genpkglist
%{_bindir}/gensrclist
%{_bindir}/genbasedir
@@ -360,6 +334,11 @@
%changelog
+* Sat Mar 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc7-1
+- 0.5.15cnc7, drop patches applied upstream.
+- Fix groupinstall config file permissions.
+- Various specfile and build cleanups and typo fixes.
+
* Wed Feb 16 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc6-16.r362
- Make mirror-select.lua write commented out rpm-src entries for Extras (Panu).
- Add Extras GPG key (Panu), and add it to fedora-vendors.list.
@@ -399,7 +378,7 @@
* Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
- revision r362
-- add rpmprioties file for rawhide
+- add rpmpriorities file for rawhide
* Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
- update to revision r361
@@ -407,7 +386,7 @@
- provide apt-mirrorselect so repo-configs can depend on it
- preliminary fixes for x86_64:
- put scripts to /usr/share/apt/scripts instead of /usr/lib
- - build python bindings with -fPIC
+ - build python bindings with -fPIC
* Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
- update to revision r360
@@ -433,7 +412,7 @@
- add new subpackage for groupinstall (to avoid dependening on comps and rhpl
for core apt)
- update to revision 353 from upstream for various bugfixes and enhancements,
- drop merged patches
+ drop merged patches
- remove NOISY=1 from make, hasn't done anything in ages..
* Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
@@ -492,7 +471,7 @@
- Ville's docbook building fix
* Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf
+- add upgrade-virtual=true back to default.conf
- updated version of upgradevirt.lua, fixed kernel-module package handling
* Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
@@ -510,7 +489,7 @@
- remember to set kernel::module-prefix in default.conf
- add upgradevirt.lua to all the necessary new slot
- move kernel from Essential priority to Important in rpmpriorities, allow-
- duplicated packages don't behave well with Essential priority
+ duplicated packages don't behave well with Essential priority
* Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
- update to 0.5.15cnc6
@@ -531,14 +510,14 @@
* Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
- Pull patch for revs 266-274 from upstream, containing various important
- fixes (epoch handling, build system related etc)
+ fixes (epoch handling, build system related etc)
* Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
- Fix build on FC2-test1 (conditional libselinux-devel buildreq)
* Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
- automatically handle fedora.us style kernel-module packages with kernel
- updates
+ updates
- don't run mirror-selector if quiet mode set (== non-interactive)
- don't trash sources.list on upgrade, only if user chooses to do so
@@ -557,7 +536,7 @@
* Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
- make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us
+- use mirror lists on fedora.us
- include Fedora Legacy gpg key
* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
@@ -581,7 +560,7 @@
- drop patches merged upstream
* Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extranuous mirror-select configs from default.conf
+- remove extraneous mirror-select configs from default.conf
- updated mirror-select script
* Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
@@ -650,7 +629,7 @@
* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
- update rpmlib patch to -7 which has more sensible error reporting
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
+* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
- update to 0.5.15cnc2
- remove patches 6-9, they're merged upstream now
- use fedora-style buildroot
@@ -749,12 +728,12 @@
- drop patches merged upstream
* Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get
+- patch from upstream to fix a security problem where lua-scripts can get
accidentally executed from cwd
* Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
- apt doesn't like build deps on versioned virtual provides -> only RH7.3
- package buildrequires python2-devel, newer ones have python-devel
+ package buildrequires python2-devel, newer ones have python-devel
* Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
- fix the proxy template format in apt.conf
@@ -778,11 +757,11 @@
- fix #259
- add missing ncurses-devel buildreq (for apt-shell)
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
+* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
- add missing libelf-devel buildreq for RH8.0 (#254)
- add missing readline-devel buildreq (for apt-shell)
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
+* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
- add /etc/apt/scripts directory (for Lua scripts)
* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
@@ -802,7 +781,7 @@
* Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
- patch to speed up apt startup and genbasedir
- drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list
+- include current mirrors in sources.list
- autodetect RH version
* Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
@@ -824,7 +803,7 @@
- add epoch to requires =, >= too
* Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink
+- fix segfault if rpm-dir index is a broken symlink
- rpmpriorities generated from comps.xml
- dont tag the various keys as %dir :-/
Index: mirror-select.conf
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/mirror-select.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mirror-select.conf 17 Jan 2005 22:01:26 -0000 1.3
+++ mirror-select.conf 27 Mar 2005 12:10:13 -0000 1.4
@@ -3,5 +3,5 @@
Scripts::AptGet::Help::Command:: "mirror-select.lua";
Dir::Etc::sourceparts::mirrorsource "mirror-select.list";
Dir::State::mirrors "mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fcFCREL-mirrors.list";
-Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fcFCREL-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/fedora.us-fc3-mirrors.list";
+Apt::State::mirrors-URL:: "http://www.fedora.us/mirrorlists/macromedia-fc3-mirrors.list";
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 8 Nov 2004 04:04:37 -0000 1.3
+++ sources 27 Mar 2005 12:10:13 -0000 1.4
@@ -1 +1 @@
-134575fd06c8c84d46766a65ed8a26af apt-0.5.15cnc6.tar.bz2
+9e44ec1503fa96832bbd9b532543e4de apt-0.5.15cnc7.tar.bz2
--- apt-0.5.15cnc6-docbook.patch DELETED ---
--- apt-0.5.15cnc6-pymake.patch DELETED ---
--- apt-0.5.15cnc6-python-update.patch DELETED ---
--- apt-0.5.15cnc6-r362.patch DELETED ---
--- apt-0.5.15cnc6-scriptdir.patch DELETED ---
--- gpg-checker.lua DELETED ---
--- gpg-import.lua DELETED ---
--- rpmpriorities.1 DELETED ---
--- rpmpriorities.2 DELETED ---
--- rpmpriorities.3 DELETED ---
--- rpmpriorities.Rawhide DELETED ---
- Previous message (by thread): rpms/apt/devel apt-pymake.patch, NONE, 1.1 apt-scriptdir.patch, NONE, 1.1 rpmpriorities, 1.2, 1.3 .cvsignore, 1.3, 1.4 apt.spec, 1.12, 1.13 mirror-select.conf, 1.3, 1.4 sources, 1.3, 1.4 apt-0.5.15cnc6-docbook.patch, 1.1, NONE apt-0.5.15cnc6-pymake.patch, 1.2, NONE apt-0.5.15cnc6-python-update.patch, 1.1, NONE apt-0.5.15cnc6-r362.patch, 1.1, NONE apt-0.5.15cnc6-scriptdir.patch, 1.1, NONE gpg-checker.lua, 1.2, NONE gpg-import.lua, 1.2, NONE rpmpriorities.1, 1.3, NONE rpmpriorities.2, 1.3, NONE rpmpriorities.3, 1.1, NONE rpmpriorities.Rawhide, 1.1, NONE
- Next message (by thread): rpms/apt/devel rpmpriorities,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list