rpms/kdeadmin/devel kdeadmin-3.5.4-knetworkconf-fc-6.patch, NONE, 1.1 kdeadmin.spec, 1.65, 1.66
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Aug 18 16:25:52 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdeadmin/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8802
Modified Files:
kdeadmin.spec
Added Files:
kdeadmin-3.5.4-knetworkconf-fc-6.patch
Log Message:
add FC6 support in knetworkconf
kdeadmin-3.5.4-knetworkconf-fc-6.patch:
network-conf.in | 2 +-
network.pl.in | 7 +++++++
platform.pl.in | 1 +
service.pl.in | 5 ++++-
4 files changed, 13 insertions(+), 2 deletions(-)
--- NEW FILE kdeadmin-3.5.4-knetworkconf-fc-6.patch ---
--- kdeadmin-3.5.4/knetworkconf/backends/service.pl.in.orig 2006-08-18 18:12:31.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/service.pl.in 2006-08-18 18:13:57.000000000 +0200
@@ -100,6 +100,7 @@
"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"],
"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"],
@@ -171,6 +172,7 @@
"fedora-3" => [3, 5],
"fedora-4" => [3, 5],
"fedora-5" => [3, 5],
+ "fedora-6" => [3, 5],
"rpath" => [3, 5],
"vine-3.0" => [3, 5],
@@ -239,6 +241,7 @@
"fedora-3" => "redhat-5.2",
"fedora-4" => "redhat-5.2",
"fedora-5" => "redhat-5.2",
+ "fedora-6" => "redhat-5.2",
"rpath" => "redhat-5.2",
"vine-3.0" => "redhat-5.2",
@@ -1717,7 +1720,7 @@
"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,
"rpath" => \&gst_service_redhat_get_status,
"suse-9.0" => \&gst_service_suse_get_status,
--- kdeadmin-3.5.4/knetworkconf/backends/network.pl.in.orig 2006-08-18 18:06:20.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/network.pl.in 2006-08-18 18:08:52.000000000 +0200
@@ -524,6 +524,7 @@
"fedora-3" => "redhat-6.2",
"fedora-4" => "redhat-6.2",
"fedora-5" => "redhat-6.2",
+ "fedora-6" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
@@ -1829,6 +1830,7 @@
"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,
"rpath" => \&gst_network_rh72_get_file,
"vine-3.0" => \&gst_network_rh62_get_file,
"vine-3.1" => \&gst_network_rh62_get_file,
@@ -3950,6 +3952,7 @@
"fedora-3" => "",
"fedora-4" => "",
"fedora-5" => "",
+ "fedora-6" => "",
"rpath" => "",
"vine-3.0" => "lo",
"vine-3.1" => "lo",
@@ -4116,6 +4119,7 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -4538,6 +4542,7 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
@@ -5377,6 +5382,7 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -5784,6 +5790,7 @@
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
"fedora-5" => "redhat-7.2",
+ "fedora-6" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
--- kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in.orig 2006-08-18 18:08:56.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/platform.pl.in 2006-08-18 18:12:20.000000000 +0200
@@ -97,6 +97,7 @@
"fedora-3" => "Fedora Core 3 (Heidelberg)",
"fedora-4" => "Fedora Core 4 (Stentz)",
"fedora-5" => "Fedora Core 5 (Bordeaux)",
+ "fedora-6" => "Fedora Core 6",
"rpath" => "rPath Linux",
"ark" => "Ark Linux",
};
--- kdeadmin-3.5.4/knetworkconf/backends/network-conf.in.orig 2006-08-18 18:14:00.000000000 +0200
+++ kdeadmin-3.5.4/knetworkconf/backends/network-conf.in 2006-08-18 18:14:28.000000000 +0200
@@ -71,7 +71,7 @@
"debian-2.2", "debian-3.0", "debian-sarge",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06",
"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", "rpath",
"pld-1.0", "pld-1.1", "pld-1.99",
"conectiva-9", "conectiva-10",
"vine-3.0", "vine-3.1",
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/devel/kdeadmin.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- kdeadmin.spec 10 Aug 2006 10:21:46 -0000 1.65
+++ kdeadmin.spec 18 Aug 2006 16:25:46 -0000 1.66
@@ -24,7 +24,7 @@
%define appdir %{_datadir}/applications/kde
Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Name: kdeadmin
Summary: Administrative tools for KDE.
Epoch: 7
@@ -39,6 +39,8 @@
Source4: kpackage.pamd
Source5: kpackagerc
+Patch0: kdeadmin-3.5.4-knetworkconf-fc-6.patch
+
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
@@ -67,6 +69,7 @@
%prep
%setup -q
+%patch0 -p1 -b .fc6
%if ! %{kpackage}
echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
@@ -315,6 +318,9 @@
%endif
%changelog
+* Fri Aug 18 2006 Than Ngo <than at redhat.com> 7:3.5.4-2
+- add FC6 support in knetworkconf
+
* Thu Aug 10 2006 Than Ngo <than at redhat.com> 7:3.5.4-1
- rebuild
More information about the fedora-cvs-commits
mailing list