diff options
Diffstat (limited to 'redhat/kdeadmin')
| -rw-r--r-- | redhat/kdeadmin/bp004-1f719050.diff | 32 | ||||
| -rw-r--r-- | redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch | 336 | ||||
| -rw-r--r-- | redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec | 28 |
3 files changed, 228 insertions, 168 deletions
diff --git a/redhat/kdeadmin/bp004-1f719050.diff b/redhat/kdeadmin/bp004-1f719050.diff new file mode 100644 index 000000000..97e90ba30 --- /dev/null +++ b/redhat/kdeadmin/bp004-1f719050.diff @@ -0,0 +1,32 @@ +commit 1f71905047d874cdc6c63049e566a4d7b976b0fc +Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> +Date: 1327530712 -0600 + + Fix linear alphabet string errors + +diff --git a/kcron/ctcron.cpp b/kcron/ctcron.cpp +index e470a72..f5cb04c 100644 +--- a/kcron/ctcron.cpp ++++ b/kcron/ctcron.cpp +@@ -178,7 +178,7 @@ istream& operator >> (istream& inputStream, CTCron& cron) + if ((line.find("#") == 0) && (line.find("\\") != 1)) + { + // If the first 10 characters don't contain a character, it's probably a disabled entry. +- int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ"); ++ int first_text = line.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); + if (first_text < 0) + continue; + +diff --git a/kuser/misc.cpp b/kuser/misc.cpp +index 6b26a72..c16f563 100644 +--- a/kuser/misc.cpp ++++ b/kuser/misc.cpp +@@ -135,7 +135,7 @@ void addShell(const TQString &shell) + TQCString genSalt( int len ) + { + TQCString salt( len + 1 ); +- const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPTQRSTUVWXYZ0123456789./"; ++ const char * set = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; + + salt[0] = set[getpid() % strlen(set)]; + for( int i = 1; i < len; i++ ) { diff --git a/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch b/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch index 2ce36a0e2..9ba0d0d99 100644 --- a/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch +++ b/redhat/kdeadmin/kdeadmin-3.5.13-add_rhel_fedora.patch @@ -1,6 +1,158 @@ -diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetworkconf/backends/network-conf.in ---- kdeadmin.ORI/knetworkconf/backends/network-conf.in 2012-01-11 20:15:15.161715402 +0100 -+++ kdeadmin.P/knetworkconf/backends/network-conf.in 2012-01-11 20:39:21.746715574 +0100 +--- kdeadmin/knetworkconf/backends/service.pl.in.knetworkconf 2010-08-12 05:28:14.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/service.pl.in 2012-05-03 11:09:05.093902723 +0200 +@@ -59,6 +59,9 @@ + "redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ ++ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + + "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], + "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], +@@ -110,6 +113,10 @@ + "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-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], ++ "fedora-17" => ["$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"], + "ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], +@@ -139,6 +146,9 @@ + "redhat-9" => [3, 5], + "openna-1.0" => [3, 5], + ++ "rhel-5" => [3, 5], ++ "rhel-6" => [3, 5], ++ + "mandrake-7.1" => [3, 5], + "mandrake-7.2" => [3, 5], + "mandrake-9.0" => [3, 5], +@@ -189,6 +199,10 @@ + "fedora-4" => [3, 5], + "fedora-5" => [3, 5], + "rpath" => [3, 5], ++ ++ "fedora-15" => [3, 5], ++ "fedora-16" => [3, 5], ++ "fedora-17" => [3, 5], + + "vine-3.0" => [3, 5], + "vine-3.1" => [3, 5], +@@ -218,6 +232,9 @@ + "redhat-9" => "redhat-5.2", + "openna-1.0" => "redhat-5.2", + ++ "rhel-5" => "redhat-5.2", ++ "rhel-6" => "redhat-5.2", ++ + "mandrake-7.1" => "redhat-5.2", + "mandrake-7.2" => "redhat-5.2", + "mandrake-9.0" => "redhat-5.2", +@@ -267,6 +284,10 @@ + "fedora-5" => "redhat-5.2", + "rpath" => "redhat-5.2", + ++ "fedora-15" => "redhat-5.2", ++ "fedora-16" => "redhat-5.2", ++ "fedora-17" => "redhat-5.2", ++ + "vine-3.0" => "redhat-5.2", + "vine-3.1" => "redhat-5.2", + "ark" => "redhat-5.2", +@@ -1744,12 +1765,17 @@ + "redhat-7.3" => \&gst_service_redhat_get_status, + "redhat-8.0" => \&gst_service_redhat_get_status, + "redhat-9" => \&gst_service_redhat_get_status, ++ "rhel-5" => \&gst_service_redhat_get_status, ++ "rhel-6" => \&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-15" => \&gst_service_redhat_get_status, ++ "fedora-16" => \&gst_service_redhat_get_status, ++ "fedora-17" => \&gst_service_redhat_get_status, + + "rpath" => \&gst_service_redhat_get_status, + +--- kdeadmin/knetworkconf/backends/platform.pl.in.knetworkconf 2011-10-19 07:30:39.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/platform.pl.in 2012-05-03 11:07:51.399862363 +0200 +@@ -71,6 +71,8 @@ + "redhat-7.3" => "Red Hat Linux 7.3 Valhalla", + "redhat-8.0" => "Red Hat Linux 8.0 Psyche", + "redhat-9" => "Red Hat Linux 9.0 Shrike", ++ "rhel-5" => "Enterprise Linux 5", ++ "rhel-6" => "Enterprise Linux 6", + "openna-1.0" => "OpenNA Linux 1.0 VSLC", + "mandrake-7.1" => "Linux Mandrake 7.1", + "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey", +@@ -116,6 +118,9 @@ + "fedora-3" => "Fedora Core 3 (Heidelberg)", + "fedora-4" => "Fedora Core 4 (Stentz)", + "fedora-5" => "Fedora Core 5 (Bordeaux)", ++ "fedora-15" => "Fedora 15 (LoveLock)", ++ "fedora-16" => "Fedora 16 (Verne)", ++ "fedora-17" => "Fedora 17 (Beefy Miracle)", + "rpath" => "rPath Linux", + "ark" => "Ark Linux", + }; +@@ -184,6 +189,27 @@ + return -1; + } + ++sub check_rhel ++{ ++ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1; ++ while (<RELEASE>) ++ { ++ chomp; ++ if ( ++ (/^CentOS release (\d)([\d\.]+)\s+.*/) ++ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/) ++ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/) ++ ) ++ { ++ close RELEASE; ++ return "rhel-$1"; ++ } ++ } ++ close RELEASE; ++ return -1; ++} ++ ++ + sub check_openna + { + open OPENNA, "$gst_prefix/etc/openna-release" or return -1; +@@ -336,7 +362,10 @@ + $ver = $_; + chomp ($ver); + +- if ($ver =~ /^Fedora Core release (\S+)/) ++ if ( ++ ($ver =~ /^Fedora Core release (\S+)/) ++ or ($ver =~ /^Fedora release (\S+)/) ++ ) + { + close FEDORA; + return "fedora-$1"; +@@ -577,7 +606,7 @@ + my %check = ( + # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther + "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine, +- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna, ++ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna, + \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ], + "FreeBSD" => [ \&check_freebsd ], + "SunOS" => [ \&check_solaris ] +--- kdeadmin/knetworkconf/backends/network-conf.in.knetworkconf 2010-08-12 05:28:14.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/network-conf.in 2012-05-03 11:04:14.035793003 +0200 @@ -63,6 +63,7 @@ $version = "@VERSION@"; @platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1", @@ -14,13 +166,12 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetwor "ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.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", "rpath", "fedora-15", "fedora-16", ++ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16", "fedora-17", "pld-1.0", "pld-1.1", "pld-1.99", "conectiva-9", "conectiva-10", "vine-3.0", "vine-3.1", -diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkconf/backends/network.pl.in ---- kdeadmin.ORI/knetworkconf/backends/network.pl.in 2012-01-11 20:15:15.161715402 +0100 -+++ kdeadmin.P/knetworkconf/backends/network.pl.in 2012-01-11 20:33:43.120340531 +0100 +--- kdeadmin/knetworkconf/backends/network.pl.in.knetworkconf 2011-08-13 08:35:25.000000000 +0200 ++++ kdeadmin/knetworkconf/backends/network.pl.in 2012-05-03 11:05:51.621170496 +0200 @@ -492,6 +492,8 @@ "redhat-7.2" => "redhat-6.2", "redhat-8.0" => "redhat-6.2", @@ -30,16 +181,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "redhat-6.2", "debian-2.2" => "debian-2.2", "debian-3.0" => "debian-2.2", -@@ -538,6 +540,8 @@ +@@ -538,6 +540,9 @@ "fedora-3" => "redhat-6.2", "fedora-4" => "redhat-6.2", "fedora-5" => "redhat-6.2", + "fedora-15" => "redhat-6.2", + "fedora-16" => "redhat-6.2", ++ "fedora-17" => "redhat-6.2", "rpath" => "redhat-6.2", "vine-3.0" => "redhat-6.2", "vine-3.1" => "redhat-6.2", -@@ -1816,6 +1820,8 @@ +@@ -1816,6 +1821,8 @@ "redhat-7.2" => \&gst_network_rh72_get_file, "redhat-8.0" => \&gst_network_rh72_get_file, "redhat-9" => \&gst_network_rh72_get_file, @@ -48,16 +200,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => \&gst_network_rh62_get_file, "mandrake-7.2" => \&gst_network_rh62_get_file, "mandrake-7.1" => \&gst_network_rh62_get_file, -@@ -1863,6 +1869,8 @@ +@@ -1863,6 +1870,9 @@ "fedora-3" => \&gst_network_rh72_get_file, "fedora-4" => \&gst_network_rh72_get_file, "fedora-5" => \&gst_network_rh72_get_file, + "fedora-15" => \&gst_network_rh72_get_file, + "fedora-16" => \&gst_network_rh72_get_file, ++ "fedora-17" => \&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, -@@ -3961,6 +3969,8 @@ +@@ -3961,6 +3971,8 @@ "redhat-7.2" => "lo", "redhat-8.0" => "lo", "redhat-9" => "", @@ -66,16 +219,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "lo", "mandrake-7.1" => "lo", "mandrake-7.2" => "lo", -@@ -4008,6 +4018,8 @@ +@@ -4008,6 +4020,9 @@ "fedora-3" => "", "fedora-4" => "", "fedora-5" => "", + "fedora-15" => "", + "fedora-16" => "", ++ "fedora-17" => "", "rpath" => "", "vine-3.0" => "lo", "vine-3.1" => "lo", -@@ -4150,6 +4162,8 @@ +@@ -4150,6 +4165,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-7.2", "redhat-9" => "redhat-7.2", @@ -84,16 +238,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "redhat-6.2", "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", -@@ -4197,6 +4211,8 @@ +@@ -4197,6 +4214,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", -@@ -4585,6 +4604,8 @@ +@@ -4585,6 +4605,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-8.0", "redhat-9" => "redhat-8.0", @@ -102,16 +257,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "openna-1.0" => "redhat-6.2", "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", -@@ -4632,6 +4650,8 @@ +@@ -4632,6 +4654,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", -@@ -5445,6 +5465,8 @@ +@@ -5445,6 +5470,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-7.2", "redhat-9" => "redhat-7.2", @@ -120,16 +276,17 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", "mandrake-9.0" => "redhat-7.0", -@@ -5491,6 +5513,8 @@ +@@ -5491,6 +5518,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "redhat-7.0", "vine-3.1" => "redhat-7.0", -@@ -5872,6 +5896,8 @@ +@@ -5872,6 +5902,8 @@ "redhat-7.2" => "redhat-7.2", "redhat-8.0" => "redhat-8.0", "redhat-9" => "redhat-8.0", @@ -138,150 +295,13 @@ diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkc "mandrake-7.1" => "redhat-6.2", "mandrake-7.2" => "redhat-6.2", "mandrake-9.0" => "mandrake-9.0", -@@ -5918,6 +5944,8 @@ +@@ -5918,6 +5950,9 @@ "fedora-3" => "redhat-7.2", "fedora-4" => "redhat-7.2", "fedora-5" => "redhat-7.2", + "fedora-15" => "redhat-7.2", + "fedora-16" => "redhat-7.2", ++ "fedora-17" => "redhat-7.2", "rpath" => "redhat-7.2", "vine-3.0" => "vine-3.0", "vine-3.1" => "vine-3.0", -diff -Nuar kdeadmin.ORI/knetworkconf/backends/platform.pl.in kdeadmin.P/knetworkconf/backends/platform.pl.in ---- kdeadmin.ORI/knetworkconf/backends/platform.pl.in 2012-01-11 20:15:15.161715402 +0100 -+++ kdeadmin.P/knetworkconf/backends/platform.pl.in 2012-01-11 20:38:27.401468302 +0100 -@@ -71,6 +71,8 @@ - "redhat-7.3" => "Red Hat Linux 7.3 Valhalla", - "redhat-8.0" => "Red Hat Linux 8.0 Psyche", - "redhat-9" => "Red Hat Linux 9.0 Shrike", -+ "rhel-5" => "Enterprise Linux 5", -+ "rhel-6" => "Enterprise Linux 6", - "openna-1.0" => "OpenNA Linux 1.0 VSLC", - "mandrake-7.1" => "Linux Mandrake 7.1", - "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey", -@@ -116,6 +118,8 @@ - "fedora-3" => "Fedora Core 3 (Heidelberg)", - "fedora-4" => "Fedora Core 4 (Stentz)", - "fedora-5" => "Fedora Core 5 (Bordeaux)", -+ "fedora-15" => "Fedora 15 (LoveLock)", -+ "fedora-16" => "Fedora 16 (Verne)", - "rpath" => "rPath Linux", - "ark" => "Ark Linux", - }; -@@ -184,6 +188,27 @@ - return -1; - } - -+sub check_rhel -+{ -+ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1; -+ while (<RELEASE>) -+ { -+ chomp; -+ if ( -+ (/^CentOS release (\d)([\d\.]+)\s+.*/) -+ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/) -+ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/) -+ ) -+ { -+ close RELEASE; -+ return "rhel-$1"; -+ } -+ } -+ close RELEASE; -+ return -1; -+} -+ -+ - sub check_openna - { - open OPENNA, "$gst_prefix/etc/openna-release" or return -1; -@@ -577,7 +602,7 @@ - my %check = ( - # Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther - "Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine, -- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna, -+ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna, - \&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ], - "FreeBSD" => [ \&check_freebsd ], - "SunOS" => [ \&check_solaris ] -diff -Nuar kdeadmin.ORI/knetworkconf/backends/service.pl.in kdeadmin.P/knetworkconf/backends/service.pl.in ---- kdeadmin.ORI/knetworkconf/backends/service.pl.in 2012-01-11 20:15:15.160715344 +0100 -+++ kdeadmin.P/knetworkconf/backends/service.pl.in 2012-01-11 20:21:36.452645160 +0100 -@@ -59,6 +59,9 @@ - "redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ -+ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - - "mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], - "mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -@@ -110,6 +113,9 @@ - "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-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -+ "fedora-16" => ["$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"], - "ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"], -@@ -139,6 +145,9 @@ - "redhat-9" => [3, 5], - "openna-1.0" => [3, 5], - -+ "rhel-5" => [3, 5], -+ "rhel-6" => [3, 5], -+ - "mandrake-7.1" => [3, 5], - "mandrake-7.2" => [3, 5], - "mandrake-9.0" => [3, 5], -@@ -189,6 +198,9 @@ - "fedora-4" => [3, 5], - "fedora-5" => [3, 5], - "rpath" => [3, 5], -+ -+ "fedora-15" => [3, 5], -+ "fedora-16" => [3, 5], - - "vine-3.0" => [3, 5], - "vine-3.1" => [3, 5], -@@ -218,6 +230,9 @@ - "redhat-9" => "redhat-5.2", - "openna-1.0" => "redhat-5.2", - -+ "rhel-5" => "redhat-5.2", -+ "rhel-6" => "redhat-5.2", -+ - "mandrake-7.1" => "redhat-5.2", - "mandrake-7.2" => "redhat-5.2", - "mandrake-9.0" => "redhat-5.2", -@@ -267,6 +282,9 @@ - "fedora-5" => "redhat-5.2", - "rpath" => "redhat-5.2", - -+ "fedora-15" => "redhat-5.2", -+ "fedora-16" => "redhat-5.2", -+ - "vine-3.0" => "redhat-5.2", - "vine-3.1" => "redhat-5.2", - "ark" => "redhat-5.2", -@@ -1744,12 +1762,16 @@ - "redhat-7.3" => \&gst_service_redhat_get_status, - "redhat-8.0" => \&gst_service_redhat_get_status, - "redhat-9" => \&gst_service_redhat_get_status, -+ "rhel-5" => \&gst_service_redhat_get_status, -+ "rhel-6" => \&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-15" => \&gst_service_redhat_get_status, -+ "fedora-16" => \&gst_service_redhat_get_status, - - "rpath" => \&gst_service_redhat_get_status, - diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec index dd52c4543..87383392a 100644 --- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec +++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -39,8 +39,11 @@ Source5: kpackagerc Source6: ksysvrc Source7: kuserrc -# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16 -Patch0: kdeadmin-3.5.13-add_rhel_fedora.patch +# [kdeadmin/knetworkconf] Add RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17 +Patch1: kdeadmin-3.5.13-add_rhel_fedora.patch + +# [kdeadmin] Fix linear alphabet string errors [Commit #1f719050] +Patch2: bp004-1f719050.diff Requires: trinity-kdelibs Requires: pkgconfig @@ -50,23 +53,24 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: rpm-devel %description -The kdeadmin package includes administrative tools for the K Desktop -Environment (KDE) including: +The kdeadmin package includes administrative tools for the Trinity Desktop +Environment (TDE) including: kcron, kdat, knetworkconf, kpackage, ksysv, kuser. %prep %setup -q -n kdeadmin -%patch0 -p1 + +%patch1 -p1 -b .knetworkconf # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -171,6 +175,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Thu Apr 03 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Fix knetworkconf support for Fedora, adds Fedora 17 +- Fix linear alphabet string errors [Commit #1f719050] + * Wed Jan 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Add knetworkconf support for RHEL 5, RHEL 6, Fedora 15, Fedora 16 - Remove 'consolehelper' macro |