smeserver-yum/sme8/smeserver-yum-1.2.0-add2general.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
--- smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum     2008-04-27 18:37:19.000000000 +0200
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum   2008-04-27 18:35:18.000000000 +0200
@@ -190,11 +190,6 @@
     </entry>
 
     <entry>
-       <base>REMOVE_SOFTWARE</base>
-       <trans>Remove</trans>
-    </entry>
-
-    <entry>
         <base>DESC_BUTTON_CONFIGURATION</base>
         <trans>
             <![CDATA[
@@ -243,11 +238,6 @@
      </entry>
 
     <entry>
-       <base>POST_UPGRADE</base>
-       <trans>Reconfigure</trans>
-    </entry>
-
-    <entry>
        <base>ERROR_UPDATING</base>
        <trans>An error occurred while updating the system.</trans>
     </entry>
diff -Nur -x '*.orig' -x '*.rej' smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum
--- smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum      2008-04-27 18:37:19.000000000 +0200
+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum    2008-04-27 18:36:34.000000000 +0200
@@ -212,7 +212,7 @@
 
         <subroutine src="print_skip_header()" />
 
-        <subroutine src="print_button('REMOVE_SOFTWARE')" />
+        <subroutine src="print_button('REMOVE')" />
     </page>
 
     <page name="YUM_PAGE_CONFIGURATION" 
@@ -260,7 +260,7 @@
 
         <subroutine src="display_yum_log()" />
 
-        <subroutine src="print_button('POST_UPGRADE')" />
+        <subroutine src="print_button('RECONFIGURE')" />
     </page>
 
 </form>
--- smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum.add2general3        2008-07-04 23:22:42.000000000 +0200
+++ smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum     2008-07-04 23:25:52.000000000 +0200
@@ -238,11 +238,6 @@
      </entry>
 
     <entry>
-       <base>ERROR_UPDATING</base>
-       <trans>An error occurred while updating the system.</trans>
-    </entry>
-
-    <entry>
        <base>SYSTEM_BEING_RECONFIGURED</base>
        <trans>
                Your system is being automatically rebooted to 
--- smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm.add2general4        2008-07-05 18:29:50.000000000 +0200
+++ smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm     2008-07-05 18:29:50.000000000 +0200
@@ -214,7 +214,7 @@
 
     unless ( system( "/sbin/e-smith/signal-event", "yum-modify" ) == 0 )
     {
-       $fm->error('ERROR_UPDATING');
+       $fm->error('ERROR_UPDATING_CONFIGURATION');
        return undef;
     }
 
1	snetram	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
2			--- smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2008-04-27 18:37:19.000000000 +0200
3			+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2008-04-27 18:35:18.000000000 +0200
4			@@ -190,11 +190,6 @@
5			</entry>
6
7			<entry>
8			- <base>REMOVE_SOFTWARE</base>
9			- <trans>Remove</trans>
10			- </entry>
11			-
12			- <entry>
13			<base>DESC_BUTTON_CONFIGURATION</base>
14			<trans>
15			<![CDATA[
16			@@ -243,11 +238,6 @@
17			</entry>
18
19			<entry>
20			- <base>POST_UPGRADE</base>
21			- <trans>Reconfigure</trans>
22			- </entry>
23			-
24			- <entry>
25			<base>ERROR_UPDATING</base>
26			<trans>An error occurred while updating the system.</trans>
27			</entry>
28			diff -Nur -x '.orig' -x '.rej' smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum
29			--- smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2008-04-27 18:37:19.000000000 +0200
30			+++ mezzanine_patched_smeserver-yum-1.2.0/root/etc/e-smith/web/functions/yum 2008-04-27 18:36:34.000000000 +0200
31			@@ -212,7 +212,7 @@
32
33			<subroutine src="print_skip_header()" />
34
35			- <subroutine src="print_button('REMOVE_SOFTWARE')" />
36			+ <subroutine src="print_button('REMOVE')" />
37			</page>
38
39			<page name="YUM_PAGE_CONFIGURATION"
40			@@ -260,7 +260,7 @@
41
42			<subroutine src="display_yum_log()" />
43
44			- <subroutine src="print_button('POST_UPGRADE')" />
45			+ <subroutine src="print_button('RECONFIGURE')" />
46			</page>
47
48			</form>
49	snetram	1.2	--- smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum.add2general3 2008-07-04 23:22:42.000000000 +0200
50			+++ smeserver-yum-1.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2008-07-04 23:25:52.000000000 +0200
51			@@ -238,11 +238,6 @@
52			</entry>
53
54			<entry>
55			- <base>ERROR_UPDATING</base>
56			- <trans>An error occurred while updating the system.</trans>
57			- </entry>
58			-
59			- <entry>
60			<base>SYSTEM_BEING_RECONFIGURED</base>
61			<trans>
62			Your system is being automatically rebooted to
63	snetram	1.3	--- smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm.add2general4 2008-07-05 18:29:50.000000000 +0200
64			+++ smeserver-yum-1.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2008-07-05 18:29:50.000000000 +0200
65			@@ -214,7 +214,7 @@
66
67			unless ( system( "/sbin/e-smith/signal-event", "yum-modify" ) == 0 )
68			{
69			- $fm->error('ERROR_UPDATING');
70			+ $fm->error('ERROR_UPDATING_CONFIGURATION');
71			return undef;
72			}
73