rpms/kdeadmin/devel kdeadmin-4.2.98-knetworkconf.patch,NONE,1.1
Than Ngo
than at fedoraproject.org
Mon Jul 27 10:13:16 UTC 2009
Author: than
Update of /cvs/extras/rpms/kdeadmin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13553
Added Files:
kdeadmin-4.2.98-knetworkconf.patch
Log Message:
fix knetworkconf backend to recognize fedora network settings
kdeadmin-4.2.98-knetworkconf.patch:
network-conf.cmake | 2 +-
network.pl.cmake | 28 +++++++---------------------
platform.pl.cmake | 19 ++-----------------
service.pl.cmake | 16 ++++------------
4 files changed, 14 insertions(+), 51 deletions(-)
--- NEW FILE kdeadmin-4.2.98-knetworkconf.patch ---
diff -up kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake
--- kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake.orig 2009-07-27 10:59:51.000000000 +0200
+++ kdeadmin-4.2.96/knetworkconf/backends/network-conf.cmake 2009-07-27 11:01:23.000000000 +0200
@@ -71,7 +71,7 @@ $version = "@VERSION@";
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04",
"suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "specifix", "yoper-2.1", "yoper-2.2",
+ "turbolinux-7.0", "fedora", "specifix", "yoper-2.1", "yoper-2.2",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"mandriva-2006.1", "mandriva-2007.0", "mandriva-2007.1", "mandriva-2008.0", "mandriva-2008.1",
diff -up kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake
--- kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake.orig 2009-07-27 11:01:31.000000000 +0200
+++ kdeadmin-4.2.96/knetworkconf/backends/network.pl.cmake 2009-07-27 11:03:12.000000000 +0200
@@ -525,9 +525,7 @@ sub gst_network_get_broadcast_ping_cmd
"pld-1.99" => "redhat-6.2",
"conectiva-9" => "debian-2.2",
"conectiva-10" => "debian-2.2",
- "fedora-1" => "redhat-6.2",
- "fedora-2" => "redhat-6.2",
- "fedora-3" => "redhat-6.2",
+ "fedora" => "redhat-6.2",
"yoper-2.1" => "redhat-6.2",
"yoper-2.2" => "redhat-6.2",
"specifix" => "redhat-6.2",
@@ -1824,9 +1822,7 @@ sub gst_network_get_file
"pld-1.0" => \&gst_network_pld10_get_file,
"pld-1.1" => \&gst_network_pld10_get_file,
"pld-1.99" => \&gst_network_pld10_get_file,
- "fedora-1" => \&gst_network_rh72_get_file,
- "fedora-2" => \&gst_network_rh72_get_file,
- "fedora-3" => \&gst_network_rh72_get_file,
+ "fedora" => \&gst_network_rh72_get_file,
"yoper-2.1" => \&gst_network_rh72_get_file,
"yoper-2.2" => \&gst_network_rh72_get_file,
"specifix" => \&gst_network_rh72_get_file,
@@ -3943,9 +3939,7 @@ sub gst_network_ensure_loopback_interfac
"pld-1.0" => "lo",
"pld-1.1" => "lo",
"pld-1.99" => "lo",
- "fedora-1" => "",
- "fedora-2" => "",
- "fedora-3" => "",
+ "fedora" => "",
"yoper-2.1" => "",
"yoper-2.2" => "",
"specifix" => "",
@@ -4088,9 +4082,7 @@ sub gst_network_get_parse_table
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
@@ -4584,9 +4576,7 @@ sub gst_network_get_interface_parse_tabl
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
@@ -5475,9 +5465,7 @@ sub gst_network_get_replace_table
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
@@ -5921,9 +5909,7 @@ sub gst_network_get_interface_replace_ta
"pld-1.0" => "pld-1.0",
"pld-1.1" => "pld-1.0",
"pld-1.99" => "pld-1.0",
- "fedora-1" => "redhat-7.2",
- "fedora-2" => "redhat-7.2",
- "fedora-3" => "redhat-7.2",
+ "fedora" => "redhat-7.2",
"yoper-2.1" => "redhat-7.2",
"yoper-2.2" => "redhat-7.2",
"specifix" => "redhat-7.2",
diff -up kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake
--- kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake.orig 2009-07-27 11:04:48.000000000 +0200
+++ kdeadmin-4.2.96/knetworkconf/backends/platform.pl.cmake 2009-07-27 11:06:12.000000000 +0200
@@ -101,9 +101,7 @@ $PLATFORM_INFO = {
"pld-1.99" => "PLD 1.99 Ac-pre",
"vine-3.0" => "Vine Linux 3.0",
"vine-3.1" => "Vine Linux 3.1",
- "fedora-1" => "Fedora Core 1 (Yarrow)",
- "fedora-2" => "Fedora Core 2 (Tettnang)",
- "fedora-3" => "Fedora Core 3 (Heidelberg)",
+ "fedora" => "Fedora",
"yoper-2.1" => "Yoper Linux 2.1 (for i686)",
"yoper-2.2" => "Yoper Linux 2.2 (for i686)",
"specifix" => "Specifix Linux",
@@ -293,20 +291,7 @@ sub check_blackpanther
sub check_fedora
{
- open FEDORA, "$gst_prefix/etc/fedora-release" or return -1;
- while (<FEDORA>)
- {
- $ver = $_;
- chomp ($ver);
-
- if ($ver =~ /^Fedora Core release (\S+)/)
- {
- close FEDORA;
- return "fedora-$1";
- }
- }
-
- close FEDORA;
+ return "fedora" if stat ("$gst_prefix/etc/fedora-release");
return -1;
}
diff -up kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake.orig kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake
--- kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake.orig 2009-07-27 11:03:28.000000000 +0200
+++ kdeadmin-4.2.96/knetworkconf/backends/service.pl.cmake 2009-07-27 11:04:44.000000000 +0200
@@ -102,9 +102,7 @@ sub gst_service_sysv_get_paths
"pld-1.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"pld-1.99" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "fedora-1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "fedora-2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
- "fedora-3" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"yoper-2.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
"yoper-2.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -182,9 +180,7 @@ sub gst_service_sysv_get_runlevels
"pld-1.1" => [3, 5],
"pld-1.99" => [3, 5],
- "fedora-1" => [3, 5],
- "fedora-2" => [3, 5],
- "fedora-3" => [3, 5],
+ "fedora" => [3, 5],
"yoper-2.1" => [3, 5],
"yoper-2.2" => [3, 5],
@@ -262,9 +258,7 @@ sub gst_service_get_runlevel_roles
"pld-1.0" => "redhat-5.2",
"pld-1.1" => "redhat-5.2",
"pld-1.99" => "redhat-5.2",
- "fedora-1" => "redhat-5.2",
- "fedora-2" => "redhat-5.2",
- "fedora-3" => "redhat-5.2",
+ "fedora" => "redhat-5.2",
"yoper-2.1" => "redhat-5.2",
"yoper-2.2" => "redhat-5.2",
@@ -1625,9 +1619,7 @@ sub gst_service_get_status
"redhat-8.0" => \&gst_service_redhat_get_status,
"redhat-9" => \&gst_service_redhat_get_status,
"mandrake-7.2" => \&gst_service_redhat_get_status,
- "fedora-1" => \&gst_service_redhat_get_status,
- "fedora-2" => \&gst_service_redhat_get_status,
- "fedora-3" => \&gst_service_redhat_get_status,
+ "fedora" => \&gst_service_redhat_get_status,
"yoper-2.1" => \&gst_service_redhat_get_status,
"yoper-2.2" => \&gst_service_redhat_get_status,
"specifix" => \&gst_service_redhat_get_status,
More information about the fedora-extras-commits
mailing list