devel/synaptic synaptic-0.57.2-progressapi-hack.patch, NONE, 1.1 synaptic.spec, 1.26, 1.27

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/devel/synaptic
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15649

Modified Files:
	synaptic.spec 
Added Files:
	synaptic-0.57.2-progressapi-hack.patch 
Log Message:
- add an ugly kludge to make it work with new apt-rpm progress api
- update buildreq apt version for the above


synaptic-0.57.2-progressapi-hack.patch:

--- NEW FILE synaptic-0.57.2-progressapi-hack.patch ---
commit 18fa763b9ebf9c5c4bc6b0a7a759190e98baaff3
Author: Panu Matilainen <pmatilai at turre.koti.laiskiainen.org>
Date:   Mon Mar 5 22:17:51 2007 +0200

    - add ugly kludge of a patch (but that's in good company considering the
      other stuff in rpackagemanager.h) to make synaptic use what was supposed
      to be automatic synaptic compatibility progress stuff from new apt.. sigh

diff --git a/common/rpackagemanager.h b/common/rpackagemanager.h
index a632881..33f1c2c 100644
--- a/common/rpackagemanager.h
+++ b/common/rpackagemanager.h
@@ -38,6 +38,8 @@
 
 #include <string>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/configuration.h>
 
 #define protected public
 #include <apt-pkg/packagemanager.h>
@@ -57,6 +59,7 @@ class RPackageManager {
    pkgPackageManager *pm;
 
    pkgPackageManager::OrderResult DoInstallPreFork() {
+      pm->Progress = new InstPercentProgress(*_config);
       Res = pm->OrderInstall();
       return Res;
    };
@@ -71,6 +74,7 @@ class RPackageManager {
 #endif
 
    RPackageManager(pkgPackageManager *pm) : pm(pm) {};
+   ~RPackageManager() { delete pm->Progress; };
    
 };
 


Index: synaptic.spec
===================================================================
RCS file: /cvs/pkgs/devel/synaptic/synaptic.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- synaptic.spec	5 Jun 2007 23:30:05 -0000	1.26
+++ synaptic.spec	8 Jul 2007 20:33:32 -0000	1.27
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 10%{?dist}
+Release: 11%{?dist}
 
 License: GPL
 Group: Applications/System
@@ -15,12 +15,13 @@
 Patch2: http://apt-rpm.org/patches/synaptic-0.57.2-gcc41.patch
 Patch3: http://apt-rpm.org/patches/synaptic-0.57.2-repomd-1.patch
 Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch
+Patch5: http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch
 URL: http://www.nongnu.org/synaptic/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: usermode-gtk
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
-BuildRequires: apt-devel >= 0.5.15lorg3.1, rpm-devel >= 4.0
+BuildRequires: apt-devel >= 0.5.15lorg3.92, rpm-devel >= 4.0
 BuildRequires: gtk2-devel, libglade2-devel, desktop-file-utils
 BuildRequires: libstdc++-devel, gettext
 BuildRequires: xmlto, perl-XML-Parser
@@ -38,6 +39,7 @@
 %patch2 -p1 -b .gcc41
 %patch3 -p1 -b .repomd
 %patch4 -p1 -b .showprog
+%patch5 -p1 -b .progresshack
 
 %build
 %configure --disable-dependency-tracking
@@ -111,6 +113,10 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sun Jul 08 2007 Panu Matilainen <pmatilai at redhat.com> - 0.57.2-11
+- add an ugly kludge to make it work with new apt-rpm progress api
+- update buildreq apt version for the above
+
 * Sun Jun  3 2007 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.57.2-10
 - Autodetect pam_stack module at build time.