rpms/kdeadmin/F-7 kdeadmin-3.5.7-knetworkconf-f7.patch, NONE, 1.1 kdeadmin.spec, 1.76, 1.77 kdeadmin-3.5.6-knetworkconf-fc-6.patch, 1.1, NONE
Than Ngo (than)
fedora-extras-commits at redhat.com
Mon Jun 11 20:57:15 UTC 2007
Author: than
Update of /cvs/extras/rpms/kdeadmin/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14634
Modified Files:
kdeadmin.spec
Added Files:
kdeadmin-3.5.7-knetworkconf-f7.patch
Removed Files:
kdeadmin-3.5.6-knetworkconf-fc-6.patch
Log Message:
add F7 support in knetworkconf
kdeadmin-3.5.7-knetworkconf-f7.patch:
--- NEW FILE kdeadmin-3.5.7-knetworkconf-f7.patch ---
diff -Nur kdeadmin-3.5.7/knetworkconf/backends/network-conf.in kdeadmin-3.5.7-me/knetworkconf/backends/network-conf.in
--- kdeadmin-3.5.7/knetworkconf/backends/network-conf.in 2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.7-me/knetworkconf/backends/network-conf.in 2007-06-11 22:48:44.000000000 +0200
@@ -72,7 +72,7 @@
"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-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "fedora-6", "fedora-7", "rpath",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
diff -Nur kdeadmin-3.5.7/knetworkconf/backends/network.pl.in kdeadmin-3.5.7-me/knetworkconf/backends/network.pl.in
--- kdeadmin-3.5.7/knetworkconf/backends/network.pl.in 2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.7-me/knetworkconf/backends/network.pl.in 2007-06-11 22:51:01.000000000 +0200
@@ -531,6 +531,8 @@
"fedora-3" => "redhat-6.2",
"fedora-4" => "redhat-6.2",
"fedora-5" => "redhat-6.2",
+ "fedora-6" => "redhat-6.2",
+ "fedora-7" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
@@ -1843,6 +1845,8 @@
"fedora-3" => \&gst_network_rh72_get_file,
"fedora-4" => \&gst_network_rh72_get_file,
"fedora-5" => \&gst_network_rh72_get_file,
+ "fedora-6" => \&gst_network_rh72_get_file,
+ "fedora-7" => \&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,
@@ -3971,6 +3975,8 @@
"fedora-3" => "",
"fedora-4" => "",
"fedora-5" => "",
+ "fedora-6" => "",
+ "fedora-7" => "",
"rpath" => "",
"vine-3.0" => "lo",
"vine-3.1" => "lo",
@@ -4144,6 +4150,8 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -4573,6 +4581,8 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
@@ -5419,6 +5429,8 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -5833,6 +5845,8 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
+ "fedora-7" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
diff -Nur kdeadmin-3.5.7/knetworkconf/backends/platform.pl.in kdeadmin-3.5.7-me/knetworkconf/backends/platform.pl.in
--- kdeadmin-3.5.7/knetworkconf/backends/platform.pl.in 2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.7-me/knetworkconf/backends/platform.pl.in 2007-06-11 22:51:39.000000000 +0200
@@ -104,6 +104,8 @@
"fedora-3" => "Fedora Core 3 (Heidelberg)",
"fedora-4" => "Fedora Core 4 (Stentz)",
"fedora-5" => "Fedora Core 5 (Bordeaux)",
+ "fedora-6" => "Fedora Core 6 (Zod)",
+ "fedora-7" => "Fedora release 7 (Moonshine)",
"rpath" => "rPath Linux",
"ark" => "Ark Linux",
};
diff -Nur kdeadmin-3.5.7/knetworkconf/backends/service.pl.in kdeadmin-3.5.7-me/knetworkconf/backends/service.pl.in
--- kdeadmin-3.5.7/knetworkconf/backends/service.pl.in 2007-05-14 09:37:27.000000000 +0200
+++ kdeadmin-3.5.7-me/knetworkconf/backends/service.pl.in 2007-06-11 22:52:49.000000000 +0200
@@ -106,6 +106,8 @@
"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"],
+ "fedora-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
+ "fedora-7" => ["$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"],
"vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -184,6 +186,8 @@
"fedora-3" => [3, 5],
"fedora-4" => [3, 5],
"fedora-5" => [3, 5],
+ "fedora-6" => [3, 5],
+ "fedora-7" => [3, 5],
"rpath" => [3, 5],
"vine-3.0" => [3, 5],
@@ -259,6 +263,8 @@
"fedora-3" => "redhat-5.2",
"fedora-4" => "redhat-5.2",
"fedora-5" => "redhat-5.2",
+ "fedora-6" => "redhat-5.2",
+ "fedora-7" => "redhat-5.2",
"rpath" => "redhat-5.2",
"vine-3.0" => "redhat-5.2",
@@ -1742,7 +1748,8 @@
"fedora-3" => \&gst_service_redhat_get_status,
"fedora-4" => \&gst_service_redhat_get_status,
"fedora-5" => \&gst_service_redhat_get_status,
-
+ "fedora-6" => \&gst_service_redhat_get_status,
+ "fedora-7" => \&gst_service_redhat_get_status,
"rpath" => \&gst_service_redhat_get_status,
"suse-9.0" => \&gst_service_suse_get_status,
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/extras/rpms/kdeadmin/F-7/kdeadmin.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdeadmin.spec 11 Jun 2007 18:20:14 -0000 1.76
+++ kdeadmin.spec 11 Jun 2007 20:56:40 -0000 1.77
@@ -11,7 +11,7 @@
Summary: Administrative tools for KDE.
Epoch: 7
Version: 3.5.7
-Release: 1%{?dist}
+Release: 1%{?dist}.1
License: GPL
URL: http://www.kde.org/
@@ -27,7 +27,7 @@
Source6: ksysvrc
Source7: kuserrc
-Patch0: kdeadmin-3.5.6-knetworkconf-fc-6.patch
+Patch0: kdeadmin-3.5.7-knetworkconf-f7.patch
Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
@@ -50,7 +50,7 @@
%prep
%setup -q
-%patch0 -p1 -b .fc6
+%patch0 -p1 -b .f7
%if %{rhel}
echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -176,6 +176,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Jun 11 2007 Than Ngo <than at redhat.com> - 7:3.5.7-1.fc7.1
+- add F7 support in knetworkconf
+
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 7:3.5.7-1
- kdeadmin-3.5.7
- make use of consoleheloper optional for kdesu-aware apps (default yes)
--- kdeadmin-3.5.6-knetworkconf-fc-6.patch DELETED ---
More information about the fedora-extras-commits
mailing list