[WBEL-devel] Fwd: Re: [WBEL-users] rhn-applet Stuck?

Kevin Ediger kediger@licor.com
Mon, 22 Dec 2003 12:28:32 -0600


This is a multi-part message in MIME format.
--------------040102080801080101090104
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit


Here are the patches needed to fix rhn-applet and update to the latest 
Fedora version rhn-applet-2.1.4-3.

applet.spec.patch and version.patch show what I did to the spec file and 
SOURCES/version.

Regards,
Kevin Ediger

-- 
Kevin Ediger
Engineering Group Leader, Software
LI-COR, Inc.

--------------040102080801080101090104
Content-Type: text/plain;
 name="rhn-applet-2.1.4-whitebox.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="rhn-applet-2.1.4-whitebox.patch"

diff -purN rhn-applet-2.1.4-orig/rhn_applet_model.py rhn-applet-2.1.4/rhn_applet_model.py
--- rhn-applet-2.1.4-orig/rhn_applet_model.py	2003-10-23 10:01:03.000000000 -0500
+++ rhn-applet-2.1.4/rhn_applet_model.py	2003-12-22 09:28:25.000000000 -0600
@@ -276,7 +276,7 @@ class rhnAppletModel:
         rpm = self.__rpmdb__
         
         if not self.__release__:
-            releases = rpm.find_provides("redhat-release")
+            releases = rpm.find_provides("whitebox-release")
             if releases and len(releases):
                 self.__release__ = releases[0]["version"]
 
diff -purN rhn-applet-2.1.4-orig/rhn_applet_rpc.py rhn-applet-2.1.4/rhn_applet_rpc.py
--- rhn-applet-2.1.4-orig/rhn_applet_rpc.py	2003-10-15 17:52:19.000000000 -0500
+++ rhn-applet-2.1.4/rhn_applet_rpc.py	2003-12-22 09:28:43.000000000 -0600
@@ -153,7 +153,7 @@ class rhnAppletRPC(rhnAppletSource):
 	    # the cache should be disabled.
 	    #
 	    for package in self.__latest_packages__:
-	        if package['name'] == 'redhat-release':
+	        if package['name'] == 'whitebox-release':
 		    if self.__release__ != package['version']:
 		        rhn_utils.log_debug("Cache invalid, version %s current is %s" % (package['version'], self.__release__))
 			self.__latest_packages__ = []

--------------040102080801080101090104
Content-Type: text/plain;
 name="applet.spec.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="applet.spec.patch"

--- applet.spec-orig	2003-11-26 03:57:53.000000000 -0600
+++ applet.spec	2003-12-22 11:06:56.000000000 -0600
@@ -7,6 +7,7 @@ License: GPL
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 Source1: version
+Patch0: %{name}-%{version}-whitebox.patch
 Name: rhn-applet
 URL: https://rhn.redhat.com/
 Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
@@ -45,8 +46,10 @@ Panel applet for indication that newer R
 %prep
 %if %{?RHNdevel:1}%{!?RHNdevel:0} 
 %setup -c -q
+%patch0 -p1
 %else 
 %setup -q 
+%patch0 -p1
 %endif 
 
 %build

--------------040102080801080101090104
Content-Type: text/plain;
 name="version.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="version.patch"

--- version-old	2003-11-26 03:45:44.000000000 -0600
+++ version	2003-12-22 09:51:08.000000000 -0600
@@ -1 +1 @@
-2.1.4 3
+2.1.4 3.WB1

--------------040102080801080101090104--