Author: goetz
Date: Wed Jan 31 14:44:01 2007
New Revision: 115698
Added:
packages/cooker/system-tools-backends/current/SOURCES/system-tools-backends-1.4.2-mandrakelinux.patch
Removed:
packages/cooker/system-tools-backends/current/SOURCES/system-tools-backends-1.4.2-mandrakelinux.patch.bz2
Modified:
packages/cooker/system-tools-backends/current/SPECS/system-tools-backends.spec
Log:
unpack the patch
Added:
packages/cooker/system-tools-backends/current/SOURCES/system-tools-backends-1.4.2-mandrakelinux.patch
==============================================================================
--- (empty file)
+++
packages/cooker/system-tools-backends/current/SOURCES/system-tools-backends-1.4.2-mandrakelinux.patch
Wed Jan 31 14:44:01 2007
@@ -0,0 +1,107 @@
+--- system-tools-backends-1.4.2/platform.pl.in.mandrakelinux 2006-01-02
16:32:34.000000000 +0100
++++ system-tools-backends-1.4.2/platform.pl.in 2006-01-02 19:54:57.000000000
+0100
+@@ -55,15 +55,15 @@
+ "redhat-8.0" => "Red Hat Linux 8.0 Psyche",
+ "redhat-9" => "Red Hat Linux 9.0 Shrike",
+ "openna-1.0" => "OpenNA Linux 1.0 VSLC",
+- "mandrake-7.1" => "Linux Mandrake 7.1",
+- "mandrake-7.2" => "Linux Mandrake 7.2 Odyssey",
+- "mandrake-8.0" => "Linux Mandrake 8.0 Traktopel",
+- "mandrake-9.0" => "Linux Mandrake 9.0 Dolphin",
+- "mandrake-9.1" => "Linux Mandrake 9.1 Bamboo",
+- "mandrake-9.2" => "Linux Mandrake 9.2 FiveStar",
+- "mandrake-10.0" => "Linux Mandrake 10.0",
+- "mandrake-10.1" => "Linux Mandrake 10.1",
+- "mandrake-10.2" => "Linux Mandrake 2005 LE",
++ "mandrake-7.1" => "Mandrakelinux 7.1",
++ "mandrake-7.2" => "Mandrakelinux 7.2 Odyssey",
++ "mandrake-8.0" => "Mandrakelinux 8.0 Traktopel",
++ "mandrake-9.0" => "Mandrakelinux 9.0 Dolphin",
++ "mandrake-9.1" => "Mandrakelinux 9.1 Bamboo",
++ "mandrake-9.2" => "Mandrakelinux 9.2 FiveStar",
++ "mandrake-10.0" => "Mandrakelinux 10.0",
++ "mandrake-10.1" => "Mandrakelinux 10.1",
++ "mandrake-10.2" => "Mandrakelinux 2005 LE",
+ "mandriva-2006.0" => "Mandriva Linux 2006.0",
+ "mandriva-2006.1" => "Mandriva Linux 2006.1",
+ "yoper-2.2" => "Yoper Linux 2.2",
+@@ -106,18 +106,14 @@
+ # my %vermap =
+ # ("3.0" => "woody");
+
+- my %distmap =
+- ("Debian" => "debian"),
+- ("Mandrake" => "mandrake"),
+- ("Conectiva" => "conectiva"),
+- ("Blackpanther" => "blackpanther");
++ my %distmap = ("mandrakelinux" => "mandrake");
+
+ # gst_prefix not required here: parse already does that for us.
+ $dist = lc (&gst_parse_sh ("/etc/lsb-release", "DISTRIB_ID"));
+ $ver = lc (&gst_parse_sh ("/etc/lsb-release", "DISTRIB_RELEASE"));
+
+ # $ver = $vermap{$ver} if exists $vermap{$ver};
+- $dist = $distmap{$dist} if exists $dirmap{$dir};
++ $dist = $distmap{$dist} if exists $distmap{$dist};
+
+ return -1 if ($dist eq "") || ($ver eq "");
+ return "$dist-$ver";
+--- system-tools-backends-1.4.2/network.pl.in.mandrakelinux 2006-01-02
16:50:54.000000000 +0100
++++ system-tools-backends-1.4.2/network.pl.in 2006-01-02 19:50:22.000000000
+0100
+@@ -1030,11 +1030,7 @@
+
+ if (opendir IFACE_DIR, "$gst_prefix/$dir")
+ {
+- foreach $i (readdir (IFACE_DIR))
+- {
+- push @ret, $1 if ($i =~ /^ifcfg-(.+)$/);
+- }
+-
++ @ret = grep { !/\.rpm(new|old|save)$/ } map { /^ifcfg-([^~]+)$/ ? $1 : ()
} readdir (IFACE_DIR);
+ closedir (IFACE_DIR);
+ }
+
+--- system-tools-backends-1.4.2/shares-conf.in.mandrakelinux 2005-11-21
02:19:47.000000000 +0100
++++ system-tools-backends-1.4.2/shares-conf.in 2006-01-02 19:50:22.000000000
+0100
+@@ -65,7 +65,7 @@
+ "redhat-7.2", "redhat-8.0", "redhat-9",
+ "openna-1.0",
+ "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1",
"mandrake-9.2",
+- "mandrake-10.0", "mandrake-10.1",
++ "mandrake-10.0", "mandrake-10.1", "mandrake-10.2",
+ "blackpanther-4.0",
+ "debian-2.2", "debian-3.0", "debian-sarge",
+ "suse-7.0", "suse-9.0",
+--- system-tools-backends-1.4.2/services-conf.in.mandrakelinux 2006-01-02
16:32:34.000000000 +0100
++++ system-tools-backends-1.4.2/services-conf.in 2006-01-02
19:50:22.000000000 +0100
+@@ -47,7 +47,7 @@
+ "openna-1.0",
+
+ "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1",
"mandrake-9.2",
+- "mandrake-10.0", "mandrake-10.1",
++ "mandrake-10.0", "mandrake-10.1", "mandrake-10.2",
+
+ "debian-2.2", "debian-3.0", "debian-sarge",
+
+--- system-tools-backends-1.4.2/time-conf.in.mandrakelinux 2006-01-02
16:47:30.000000000 +0100
++++ system-tools-backends-1.4.2/time-conf.in 2006-01-02 19:50:22.000000000
+0100
+@@ -65,7 +65,7 @@
+ "redhat-7.2", "redhat-7.3", "redhat-8.0", "redhat-9",
+ "openna-1.0",
+ "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1",
"mandrake-9.2",
+- "mandrake-10.0", "mandrake-10.1",
++ "mandrake-10.0", "mandrake-10.1", "mandrake-10.2",
+ "debian-2.2", "debian-3.0", "debian-sarge",
+ "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
+ "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0",
"slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
+--- system-tools-backends-1.4.2/users-conf.in.mandrakelinux 2006-01-02
16:48:06.000000000 +0100
++++ system-tools-backends-1.4.2/users-conf.in 2006-01-02 19:50:22.000000000
+0100
+@@ -72,7 +72,7 @@
+ "redhat-7.2", "redhat-7.3", "redhat-8.0", "redhat-9",
+ "openna-1.0",
+ "mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1",
"mandrake-9.2",
+- "mandrake-10.0", "mandrake-10.1",
++ "mandrake-10.0", "mandrake-10.1", "mandrake-10.2",
+ "debian-2.2", "debian-3.0", "debian-sarge",
+ "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
+ "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0",
"slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
Modified:
packages/cooker/system-tools-backends/current/SPECS/system-tools-backends.spec
==============================================================================
---
packages/cooker/system-tools-backends/current/SPECS/system-tools-backends.spec
(original)
+++
packages/cooker/system-tools-backends/current/SPECS/system-tools-backends.spec
Wed Jan 31 14:44:01 2007
@@ -10,7 +10,7 @@
License: LGPL
Group: System/Configuration/Other
Source0:
http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
-Patch0: system-tools-backends-1.4.2-mandrakelinux.patch.bz2
+Patch0: system-tools-backends-1.4.2-mandrakelinux.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
URL: http://www.gnome.org/projects/gst/
BuildArch: noarch
