Accepting request 71532 from home:coolo:branches:openSUSE:Factory
- Switch is not used, so don't require it (removed from perl 5.13.1) OBS-URL: https://build.opensuse.org/request/show/71532 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=134
This commit is contained in:
parent
a8280dd268
commit
0c1ba62553
12
noswitch.patch
Normal file
12
noswitch.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
Index: yast2-network-2.20.10/src/lan/YaPI/NETWORK.pm
|
||||||
|
===================================================================
|
||||||
|
--- yast2-network-2.20.10.orig/src/lan/YaPI/NETWORK.pm 2010-12-20 15:31:59.000000000 +0100
|
||||||
|
+++ yast2-network-2.20.10/src/lan/YaPI/NETWORK.pm 2011-05-26 17:41:03.734911340 +0200
|
||||||
|
@@ -4,7 +4,6 @@ use strict;
|
||||||
|
use YaST::YCP qw(:LOGGING);
|
||||||
|
use YaPI;
|
||||||
|
use Data::Dumper;
|
||||||
|
-use Switch;
|
||||||
|
|
||||||
|
# ------------------- imported modules
|
||||||
|
YaST::YCP::Import ("LanItems");
|
@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 26 15:44:14 UTC 2011 - coolo@novell.com
|
||||||
|
|
||||||
|
- Switch is not used, so don't require it (removed from perl 5.13.1)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 23 00:32:23 CET 2010 - mzugec@suse.cz
|
Thu Dec 23 00:32:23 CET 2010 - mzugec@suse.cz
|
||||||
|
|
||||||
|
@ -1,56 +1,71 @@
|
|||||||
#
|
#
|
||||||
# spec file for package yast2-network (Version 2.20.10)
|
# spec file for package yast2-network (Version 2.20.10)
|
||||||
#
|
#
|
||||||
|
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
Name: yast2-network
|
|
||||||
Version: 2.20.10
|
|
||||||
Release: 0
|
|
||||||
|
|
||||||
|
Name: yast2-network
|
||||||
|
Version: 2.20.10
|
||||||
|
Release: 1
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
Source0: yast2-network-2.20.10.tar.bz2
|
Source0: yast2-network-2.20.10.tar.bz2
|
||||||
|
Patch0: noswitch.patch
|
||||||
|
|
||||||
prefix: /usr
|
Prefix: /usr
|
||||||
|
|
||||||
Group: System/YaST
|
Group: System/YaST
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
# should be required by devtools
|
# should be required by devtools
|
||||||
BuildRequires: pkgconfig perl-XML-Writer rpm
|
BuildRequires: perl-XML-Writer pkgconfig rpm
|
||||||
BuildRequires: update-desktop-files
|
BuildRequires: update-desktop-files
|
||||||
BuildRequires: yast2-devtools yast2-testsuite
|
BuildRequires: yast2-devtools yast2-testsuite
|
||||||
BuildRequires: yast2-country
|
BuildRequires: yast2-country
|
||||||
BuildRequires: yast2-installation >= 2.15.27
|
BuildRequires: yast2-installation >= 2.15.27
|
||||||
|
|
||||||
# NetworkStorage: adapt functions needed for iBFT (bnc#551380)
|
# NetworkStorage: adapt functions needed for iBFT (bnc#551380)
|
||||||
BuildRequires: yast2 >= 2.19.3
|
BuildRequires: yast2 >= 2.19.3
|
||||||
Requires: yast2 >= 2.19.3
|
Requires: yast2 >= 2.19.3
|
||||||
#netconfig (FaTE #303618)
|
#netconfig (FaTE #303618)
|
||||||
Requires: sysconfig >= 0.71.2
|
Requires: sysconfig >= 0.71.2
|
||||||
#GetLanguageCountry
|
#GetLanguageCountry
|
||||||
#(in newly created yast2-country-data)
|
#(in newly created yast2-country-data)
|
||||||
Requires: yast2-country-data >= 2.16.3
|
Requires: yast2-country-data >= 2.16.3
|
||||||
|
|
||||||
PreReq: /bin/rm
|
PreReq: /bin/rm
|
||||||
|
|
||||||
Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
|
Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
|
||||||
Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
|
Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
|
||||||
Provides: yast2-lib-network yast2-config-network
|
Provides: yast2-lib-network yast2-config-network
|
||||||
Obsoletes: yast2-lib-network yast2-config-network
|
Obsoletes: yast2-lib-network yast2-config-network
|
||||||
Provides: yast2-trans-network yast2-trans-adsl
|
Provides: yast2-trans-network yast2-trans-adsl
|
||||||
Obsoletes: yast2-trans-network yast2-trans-adsl
|
Obsoletes: yast2-trans-network yast2-trans-adsl
|
||||||
Provides: y2t_lan y2t_adsl y2t_dial
|
Provides: y2t_lan y2t_adsl y2t_dial
|
||||||
Obsoletes: y2t_lan y2t_adsl y2t_dial
|
Obsoletes: y2t_lan y2t_adsl y2t_dial
|
||||||
|
|
||||||
# carrier detection
|
# carrier detection
|
||||||
Conflicts: yast2-core < 2.10.6
|
Conflicts: yast2-core < 2.10.6
|
||||||
|
|
||||||
Summary: YaST2 - Network Configuration
|
Summary: YaST2 - Network Configuration
|
||||||
|
|
||||||
%package devel-doc
|
%package devel-doc
|
||||||
|
License: GPLv2+
|
||||||
Group: System/YaST
|
Group: System/YaST
|
||||||
Summary: YaST2 - Developer documentation for yast2-network
|
Summary: YaST2 - Developer documentation for yast2-network
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package contains the YaST2 component for network configuration.
|
This package contains the YaST2 component for network configuration.
|
||||||
@ -60,6 +75,7 @@ This package contains autogenerated documentation for yast2-network
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -n yast2-network-2.20.10
|
%setup -n yast2-network-2.20.10
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{prefix}/bin/y2tool y2autoconf
|
%{prefix}/bin/y2tool y2autoconf
|
||||||
@ -129,3 +145,4 @@ fi
|
|||||||
%doc %{prefix}/share/doc/packages/yast2-network
|
%doc %{prefix}/share/doc/packages/yast2-network
|
||||||
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
|
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
|
||||||
%exclude %{prefix}/share/doc/packages/yast2-network/README
|
%exclude %{prefix}/share/doc/packages/yast2-network/README
|
||||||
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user