rpms/kdeadmin/FC-5 kdeadmin-3.5.2-knetworkconf-fedora.patch, NONE, 1.1 kdeadmin.spec, 1.58, 1.59
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Jun 10 10:32:03 UTC 2006
Author: than
Update of /cvs/dist/rpms/kdeadmin/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11714
Modified Files:
kdeadmin.spec
Added Files:
kdeadmin-3.5.2-knetworkconf-fedora.patch
Log Message:
add kdeadmin-3.5.2-knetworkconf-fedora.patch
kdeadmin-3.5.2-knetworkconf-fedora.patch:
network-conf.in | 2 +-
network.pl.in | 7 +++++++
platform.pl.in | 1 +
service.pl.in | 4 ++++
4 files changed, 13 insertions(+), 1 deletion(-)
--- NEW FILE kdeadmin-3.5.2-knetworkconf-fedora.patch ---
--- kdeadmin-3.5.2/knetworkconf/backends/network.pl.in.orig 2006-05-17 21:08:23.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/network.pl.in 2006-05-17 21:09:50.000000000 +0200
@@ -523,6 +523,7 @@
"fedora-2" => "redhat-6.2",
"fedora-3" => "redhat-6.2",
"fedora-4" => "redhat-6.2",
+ "fedora-5" => "redhat-6.2",
"rpath" => "redhat-6.2",
"vine-3.0" => "redhat-6.2",
"vine-3.1" => "redhat-6.2",
@@ -1827,6 +1828,7 @@
"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,
"rpath" => \&gst_network_rh72_get_file,
"vine-3.0" => \&gst_network_rh62_get_file,
"vine-3.1" => \&gst_network_rh62_get_file,
@@ -3947,6 +3949,7 @@
"fedora-2" => "",
"fedora-3" => "",
"fedora-4" => "",
+ "fedora-5" => "",
"rpath" => "",
"vine-3.0" => "lo",
"vine-3.1" => "lo",
@@ -4112,6 +4115,7 @@
"fedora-2" => "redhat-7.2",
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
+ "fedora-5" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -4533,6 +4537,7 @@
"fedora-2" => "redhat-7.2",
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
+ "fedora-5" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
@@ -5371,6 +5376,7 @@
"fedora-2" => "redhat-7.2",
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
+ "fedora-5" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "redhat-7.0",
"vine-3.1" => "redhat-7.0",
@@ -5777,6 +5783,7 @@
"fedora-2" => "redhat-7.2",
"fedora-3" => "redhat-7.2",
"fedora-4" => "redhat-7.2",
+ "fedora-5" => "redhat-7.2",
"rpath" => "redhat-7.2",
"vine-3.0" => "vine-3.0",
"vine-3.1" => "vine-3.0",
--- kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in.orig 2006-05-17 20:46:12.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/platform.pl.in 2006-05-17 20:59:34.000000000 +0200
@@ -96,6 +96,7 @@
"fedora-2" => "Fedora Core 2 (Tettnang)",
"fedora-3" => "Fedora Core 3 (Heidelberg)",
"fedora-4" => "Fedora Core 4 (Stentz)",
+ "fedora-5" => "Fedora Core 5 (Bordeaux)",
"rpath" => "rPath Linux",
"ark" => "Ark Linux",
};
--- kdeadmin-3.5.2/knetworkconf/backends/service.pl.in.orig 2006-05-17 21:10:34.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/service.pl.in 2006-05-17 21:12:00.000000000 +0200
@@ -99,6 +99,7 @@
"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"],
"vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
@@ -169,6 +170,7 @@
"fedora-2" => [3, 5],
"fedora-3" => [3, 5],
"fedora-4" => [3, 5],
+ "fedora-5" => [3, 5],
"rpath" => [3, 5],
"vine-3.0" => [3, 5],
@@ -236,6 +238,7 @@
"fedora-2" => "redhat-5.2",
"fedora-3" => "redhat-5.2",
"fedora-4" => "redhat-5.2",
+ "fedora-5" => "redhat-5.2",
"rpath" => "redhat-5.2",
"vine-3.0" => "redhat-5.2",
@@ -1713,6 +1716,7 @@
"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,
"rpath" => \&gst_service_redhat_get_status,
--- kdeadmin-3.5.2/knetworkconf/backends/network-conf.in.orig 2006-05-17 21:12:30.000000000 +0200
+++ kdeadmin-3.5.2/knetworkconf/backends/network-conf.in 2006-05-17 21:12:52.000000000 +0200
@@ -71,7 +71,7 @@
"debian-2.2", "debian-3.0", "debian-sarge",
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.04",
"suse-7.0", "suse-9.0", "suse-9.1",
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "rpath",
+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "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/FC-5/kdeadmin.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- kdeadmin.spec 10 Jun 2006 10:25:55 -0000 1.58
+++ kdeadmin.spec 10 Jun 2006 10:32:00 -0000 1.59
@@ -44,6 +44,7 @@
Source5: kpackagerc
Patch1: kde-libtool.patch
+Patch2: kdeadmin-3.5.2-knetworkconf-fedora.patch
Requires: kdebase >= %{kdebase_epoch}:%{version}
Requires: usermode
@@ -149,6 +150,7 @@
%prep
%setup -q
%patch1 -p1 -b .libtool
+%patch2 -p1 -b .knetworkconf-fc5
%if ! %{kpackage}
echo 'DO_NOT_COMPILE="$DO_NOT_COMPILE kpackage"' >kpackage/configure.in.in
More information about the fedora-cvs-commits
mailing list