rpms/apt/FC-3 apt-shell-155990.patch,NONE,1.1 apt.spec,1.10,1.11

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/apt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3324

Modified Files:
	apt.spec 
Added Files:
	apt-shell-155990.patch 
Log Message:
Fix for #155990 from Panu, backport Michael's dir ownership fix from devel.

apt-shell-155990.patch:

--- NEW FILE apt-shell-155990.patch ---
Index: cmdline/apt-shell.cc
===================================================================
--- cmdline/apt-shell.cc	(revision 373)
+++ cmdline/apt-shell.cc	(revision 374)
@@ -1328,9 +1328,9 @@
 	 }
       }
       vector<string> GoodSolutionNames;
-      for (int i = 0; i != GoodSolutionNames.size(); i++)
+      for (int i = 0; i != GoodSolutions.size(); i++)
       {
-	 pkgCache::PkgIterator GoodPkg(Cache, GoodSolutions[0]);
+	 pkgCache::PkgIterator GoodPkg(Cache, GoodSolutions[i]);
 	 GoodSolutionNames.push_back(GoodPkg.Name());
       }
 #ifdef WITH_LUA
@@ -1339,6 +1339,7 @@
 	 vector<string> VS;
 	 _lua->SetDepCache(&Cache);
 	 _lua->SetDontFix();
+	 _lua->SetGlobal("virtualname", Pkg.Name());
 	 _lua->SetGlobal("packages", GoodSolutions);
 	 _lua->SetGlobal("packagenames", GoodSolutionNames);
 	 _lua->SetGlobal("selected");


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/FC-3/apt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apt.spec	27 Mar 2005 12:10:13 -0000	1.10
+++ apt.spec	28 Apr 2005 20:55:56 -0000	1.11
@@ -8,7 +8,7 @@
 Summary: Debian's Advanced Packaging Tool with RPM support
 Name: apt
 Version: 0.5.15cnc7
-Release: 1
+Release: 1.1
 Epoch: 0
 Group: System Environment/Base
 URL: https://moin.conectiva.com.br/AptRpm
@@ -84,6 +84,7 @@
 # Work around missing deps in rpm-devel :-/
 BuildRequires: beecrypt-devel, elfutils-libelf-devel, libselinux-devel
 
+Patch0: apt-shell-155990.patch
 # Fix some issues in python binding build
 Patch1: apt-pymake.patch
 Patch5: apt-0.5.15cnc6-pymake2.patch
@@ -138,6 +139,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .155990
 %patch1 -p0 -b .pymake
 %patch3 -p1 -b .manifest
 %patch5 -p0 -b .pymake2
@@ -315,7 +317,7 @@
 
 %files devel
 %defattr(-, root, root)
-%{_includedir}/apt-pkg/*
+%{_includedir}/apt-pkg/
 %{_libdir}/*.so
 %{_libdir}/*.a
 
@@ -334,6 +336,10 @@
 
 
 %changelog
+* Thu Apr 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.5.15cnc7-1.1
+- Fix apt-shell "install kernel" crash (#155990, Panu Matilainen).
+- Include apt-pkg includedir in -devel package (Michael Schwendt).
+
 * 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.