rpms/kdeadmin/FC-6 kdeadmin-3.5.6-knetworkconf-fc-6.patch, NONE, 1.1 .cvsignore, 1.35, 1.36 kdeadmin.spec, 1.67, 1.68 sources, 1.37, 1.38 kdeadmin-3.5.4-knetworkconf-fc-6.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 31 22:46:06 UTC 2007
- Previous message (by thread): rpms/kdeaccessibility/FC-6 .cvsignore,1.12,1.13 sources,1.15,1.16
- Next message (by thread): rpms/kdenetwork/FC-6 .cvsignore, 1.38, 1.39 kdenetwork.spec, 1.94, 1.95 sources, 1.44, 1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: than
Update of /cvs/dist/rpms/kdeadmin/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv24093
Modified Files:
.cvsignore kdeadmin.spec sources
Added Files:
kdeadmin-3.5.6-knetworkconf-fc-6.patch
Removed Files:
kdeadmin-3.5.4-knetworkconf-fc-6.patch
Log Message:
3.5.6
kdeadmin-3.5.6-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.6-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 (Zod)",
"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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-6/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore 10 Aug 2006 10:21:46 -0000 1.35
+++ .cvsignore 31 Jan 2007 22:46:04 -0000 1.36
@@ -11,3 +11,4 @@
kdeadmin-3.5.1.tar.bz2
kdeadmin-3.5.3.tar.bz2
kdeadmin-3.5.4.tar.bz2
+kdeadmin-3.5.6.tar.bz2
Index: kdeadmin.spec
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-6/kdeadmin.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- kdeadmin.spec 26 Oct 2006 20:50:50 -0000 1.67
+++ kdeadmin.spec 31 Jan 2007 22:46:04 -0000 1.68
@@ -18,12 +18,12 @@
%define arts 1
%define knetworkconf 1
-%define qt_version 3.3.6
+%define qt_version 3.3.7
%define kdelibs_epoch 6
%define kdebase_epoch 6
%define appdir %{_datadir}/applications/kde
-Version: 3.5.5
+Version: 3.5.6
Release: 0.1%{?dist}
Name: kdeadmin
Summary: Administrative tools for KDE.
@@ -39,7 +39,7 @@
Source4: kpackage.pamd
Source5: kpackagerc
-Patch0: kdeadmin-3.5.4-knetworkconf-fc-6.patch
+Patch0: kdeadmin-3.5.6-knetworkconf-fc-6.patch
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -316,6 +316,9 @@
%endif
%changelog
+* Wed Jan 31 2007 Than Ngo <than at redhat.com> 7:3.5.6-0.1.fc6
+- 3.5.6
+
* Thu Oct 26 2006 Than Ngo <than at redhat.com> 7:3.5.5-0.1
- 3.5.5
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdeadmin/FC-6/sources,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sources 26 Oct 2006 20:50:50 -0000 1.37
+++ sources 31 Jan 2007 22:46:04 -0000 1.38
@@ -1 +1 @@
-4af595f5d5506521e8b29a1d92ba3409 kdeadmin-3.5.5.tar.bz2
+13654a93e83b7c8fd2ccce3aceb2d535 kdeadmin-3.5.6.tar.bz2
--- kdeadmin-3.5.4-knetworkconf-fc-6.patch DELETED ---
- Previous message (by thread): rpms/kdeaccessibility/FC-6 .cvsignore,1.12,1.13 sources,1.15,1.16
- Next message (by thread): rpms/kdenetwork/FC-6 .cvsignore, 1.38, 1.39 kdenetwork.spec, 1.94, 1.95 sources, 1.44, 1.45
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list