rpms/kdeadmin/F-7 kdeadmin-3.5.8-knetworkconf.patch, NONE, 1.1 kdeadmin.spec, 1.78, 1.79 kdeadmin-3.5.7-knetworkconf.patch, 1.1, NONE kpackage.pam, 1.1, NONE kpackage.pamd, 1.6, NONE

Than Ngo (than) fedora-extras-commits at redhat.com
Fri Dec 21 22:14:09 UTC 2007


Author: than

Update of /cvs/extras/rpms/kdeadmin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19277

Modified Files:
	kdeadmin.spec 
Added Files:
	kdeadmin-3.5.8-knetworkconf.patch 
Removed Files:
	kdeadmin-3.5.7-knetworkconf.patch kpackage.pam kpackage.pamd 
Log Message:
- fix #344751, kpackage does not uninstall RPMs
- fix knetworkconf backend to recognize fedora network settings



kdeadmin-3.5.8-knetworkconf.patch:

--- NEW FILE kdeadmin-3.5.8-knetworkconf.patch ---
diff -up kdeadmin-3.5.8/knetworkconf/backends/network-conf.in.knetworkconf kdeadmin-3.5.8/knetworkconf/backends/network-conf.in
--- kdeadmin-3.5.8/knetworkconf/backends/network-conf.in.knetworkconf	2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.8/knetworkconf/backends/network-conf.in	2007-12-20 15:04:09.000000000 +0100
@@ -72,7 +72,7 @@ $version = "@VERSION@";
 	      "debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-testing",
               "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10",
               "suse-7.0", "suse-9.0", "suse-9.1",
-              "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
+              "turbolinux-7.0", "fedora", "rpath",
               "pld-1.0", "pld-1.1", "pld-1.99",
               "conectiva-9", "conectiva-10",
               "vine-3.0", "vine-3.1",
diff -up kdeadmin-3.5.8/knetworkconf/backends/network.pl.in.knetworkconf kdeadmin-3.5.8/knetworkconf/backends/network.pl.in
--- kdeadmin-3.5.8/knetworkconf/backends/network.pl.in.knetworkconf	2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.8/knetworkconf/backends/network.pl.in	2007-12-20 15:06:30.000000000 +0100
@@ -526,11 +526,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-4"     => "redhat-6.2",
-       "fedora-5"     => "redhat-6.2",
+       "fedora"       => "redhat-6.2",
        "rpath"        => "redhat-6.2",
        "vine-3.0"     => "redhat-6.2",
        "vine-3.1"     => "redhat-6.2",
@@ -1838,11 +1834,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-4"     => \&gst_network_rh72_get_file,
-          "fedora-5"     => \&gst_network_rh72_get_file,
+          "fedora"     => \&gst_network_rh72_get_file,
           "rpath"        => \&gst_network_rh72_get_file,
           "vine-3.0"     => \&gst_network_rh62_get_file,
           "vine-3.1"     => \&gst_network_rh62_get_file,
@@ -3966,11 +3958,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-4"     => "",
-          "fedora-5"     => "",
+          "fedora"       => "",
           "rpath"        => "",
           "vine-3.0"     => "lo",
           "vine-3.1"     => "lo",
@@ -4139,11 +4127,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-4"     => "redhat-7.2",
-          "fedora-5"     => "redhat-7.2",
+          "fedora"       => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -4568,11 +4552,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-4"     => "redhat-7.2",
-          "fedora-5"     => "redhat-7.2",
+          "fedora"       => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
@@ -5414,11 +5394,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-4"     => "redhat-7.2",
-          "fedora-5"     => "redhat-7.2",
+          "fedora"       => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "redhat-7.0",
           "vine-3.1"     => "redhat-7.0",
@@ -5828,11 +5804,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-4"     => "redhat-7.2",
-          "fedora-5"     => "redhat-7.2",
+          "fedora"       => "redhat-7.2",
           "rpath"        => "redhat-7.2",
           "vine-3.0"     => "vine-3.0",
           "vine-3.1"     => "vine-3.0",
diff -up kdeadmin-3.5.8/knetworkconf/backends/service.pl.in.knetworkconf kdeadmin-3.5.8/knetworkconf/backends/service.pl.in
--- kdeadmin-3.5.8/knetworkconf/backends/service.pl.in.knetworkconf	2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.8/knetworkconf/backends/service.pl.in	2007-12-20 15:08:05.000000000 +0100
@@ -101,12 +101,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-4"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-       "fedora-5"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
-       "rpath"        => ["$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"],
 
        "vine-3.0"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
        "vine-3.1"     => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -179,11 +174,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-4"       => [3, 5],
-       "fedora-5"       => [3, 5],
+       "fedora"         => [3, 5],
        "rpath"          => [3, 5],
        
        "vine-3.0"       => [3, 5],
@@ -254,11 +245,8 @@ 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-4"       => "redhat-5.2",
-     "fedora-5"       => "redhat-5.2",
+
+     "fedora"         => "redhat-5.2",
      "rpath"          => "redhat-5.2",
 
      "vine-3.0"       => "redhat-5.2",
@@ -1737,12 +1725,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-4"     => \&gst_service_redhat_get_status,
-       "fedora-5"     => \&gst_service_redhat_get_status,
-
+       "fedora"       => \&gst_service_redhat_get_status,
        "rpath"        => \&gst_service_redhat_get_status,
 
        "suse-9.0"     => \&gst_service_suse_get_status,
diff -up kdeadmin-3.5.8/knetworkconf/backends/platform.pl.in.knetworkconf kdeadmin-3.5.8/knetworkconf/backends/platform.pl.in
--- kdeadmin-3.5.8/knetworkconf/backends/platform.pl.in.knetworkconf	2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.8/knetworkconf/backends/platform.pl.in	2007-12-20 15:11:32.000000000 +0100
@@ -99,11 +99,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-4"        => "Fedora Core 4 (Stentz)",
-  "fedora-5"        => "Fedora Core 5 (Bordeaux)",
+  "fedora"          => "Fedora",
   "rpath"           => "rPath Linux",
   "ark"             => "Ark Linux",
 };
@@ -311,20 +307,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;
 }
 


Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-7/kdeadmin.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- kdeadmin.spec	25 Oct 2007 02:17:49 -0000	1.78
+++ kdeadmin.spec	21 Dec 2007 22:13:33 -0000	1.79
@@ -6,7 +6,7 @@
 Summary: Administrative tools for KDE
 Epoch:   7
 Version: 3.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     http://www.kde.org/
@@ -16,13 +16,11 @@
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Source1: kuser.pam
 Source2: kuser.pamd
-Source3: kpackage.pam
-Source4: kpackage.pamd
 Source5: kpackagerc
 Source6: ksysvrc
 Source7: kuserrc
 
-Patch0: kdeadmin-3.5.7-knetworkconf.patch
+Patch0: kdeadmin-3.5.8-knetworkconf.patch
 
 Requires: kdelibs3 >= %{version}
 Requires: pkgconfig
@@ -95,15 +93,6 @@
 install -p -m644 %{SOURCE2} %{buildroot}/etc/pam.d/kuser
 mv %{buildroot}%{_bindir}/kuser %{buildroot}%{_sbindir}
 ln -s consolehelper %{buildroot}%{_bindir}/kuser
-
-%if %{console_helper}
-# Run kpackage through consolehelper
-install -p -m644 %{SOURCE3} %{buildroot}/etc/security/console.apps/kpackage
-install -p -m644 %{SOURCE4} %{buildroot}/etc/pam.d/kpackage
-mv %{buildroot}%{_bindir}/kpackage %{buildroot}%{_sbindir}
-ln -s consolehelper %{buildroot}%{_bindir}/kpackage
-%endif
-
 %endif
 
 # locale's
@@ -173,6 +162,10 @@
 
 
 %changelog
+* Fri Dec 21 2007 Than Ngo <than at redhat.com> 3.5.8-2
+- fix #344751, kpackage does not uninstall RPMs
+- fix knetworkconf backend to recognize fedora network settings
+
 * Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.8-1
 - kde-3.5.8
 


--- kdeadmin-3.5.7-knetworkconf.patch DELETED ---


--- kpackage.pam DELETED ---


--- kpackage.pamd DELETED ---




More information about the fedora-extras-commits mailing list