Accepting request 33757 from YaST:Head
checked in (request 33757) OBS-URL: https://build.opensuse.org/request/show/33757 OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=70
This commit is contained in:
parent
060a71dda0
commit
98f04c1fa9
3
yast2-network-2.19.11.tar.bz2
Normal file
3
yast2-network-2.19.11.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:630b2bd0ac233f0c16f355395e99141a065cc57d394b9db3ddd869d76ddd2ff7
|
||||
size 314623
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:037d4a18380e58377904831d0c2dffe6053ae76bed9dba5577695ab028fcd55c
|
||||
size 327523
|
@ -1,20 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 2 09:57:05 CET 2010 - mzugec@suse.cz
|
||||
|
||||
- NetHwDetection: use blacklist (bnc#580729)
|
||||
- 2.19.13
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 2 09:54:54 CET 2010 - mzugec@suse.cz
|
||||
|
||||
- added fix for saving MAC address to ifcfg (bnc#578689)
|
||||
- 2.19.12
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 22 10:18:24 CET 2010 - mzugec@suse.cz
|
||||
|
||||
- mark string for translation (bnc#580019)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 9 15:51:34 CET 2010 - mzugec@suse.cz
|
||||
|
||||
|
@ -1,24 +0,0 @@
|
||||
--- package/yast2-network.changes (revision 60923)
|
||||
+++ package/yast2-network.changes (working copy)
|
||||
@@ -1,4 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
+Mon Mar 1 16:52:36 CET 2010 - mzugec@suse.cz
|
||||
+
|
||||
+- NetHwDetection: use blacklist (bnc#580729)
|
||||
+- 2.17.123
|
||||
+
|
||||
+-------------------------------------------------------------------
|
||||
+Mon Feb 22 17:03:27 CET 2010 - juhliarik@suse.cz
|
||||
+
|
||||
+- added fix for saving MAC address to ifcfg (bnc#578689)
|
||||
+- 2.17.122
|
||||
+
|
||||
+-------------------------------------------------------------------
|
||||
+Mon Feb 22 09:55:55 CET 2010 - mzugec@suse.cz
|
||||
+
|
||||
+- mark string for translation (bnc#580019)
|
||||
+
|
||||
+-------------------------------------------------------------------
|
||||
Tue Feb 16 17:30:15 CET 2010 - jsrain@suse.cz
|
||||
|
||||
- do not write network config files if not changed (fate#308978)
|
@ -1,56 +1,62 @@
|
||||
#
|
||||
# spec file for package yast2-network (Version 2.19.13)
|
||||
# spec file for package yast2-network (Version 2.19.11)
|
||||
#
|
||||
# Copyright (c) 2010 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
|
||||
|
||||
Name: yast2-network
|
||||
Version: 2.19.13
|
||||
Release: 0
|
||||
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: yast2-network-2.19.13.tar.bz2
|
||||
|
||||
prefix: /usr
|
||||
|
||||
Group: System/YaST
|
||||
License: GPL v2 or later
|
||||
Name: yast2-network
|
||||
Version: 2.19.11
|
||||
Release: 1
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Source0: yast2-network-2.19.11.tar.bz2
|
||||
Prefix: /usr
|
||||
Group: System/YaST
|
||||
License: GPLv2+
|
||||
# should be required by devtools
|
||||
BuildRequires: pkgconfig perl-XML-Writer rpm
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: yast2-devtools yast2-testsuite
|
||||
BuildRequires: yast2-country
|
||||
BuildRequires: yast2-installation >= 2.15.27
|
||||
|
||||
BuildRequires: perl-XML-Writer pkgconfig rpm
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: yast2-devtools yast2-testsuite
|
||||
BuildRequires: yast2-country
|
||||
BuildRequires: yast2-installation >= 2.15.27
|
||||
# NetworkStorage: adapt functions needed for iBFT (bnc#551380)
|
||||
BuildRequires: yast2 >= 2.19.3
|
||||
Requires: yast2 >= 2.19.3
|
||||
BuildRequires: yast2 >= 2.19.3
|
||||
Requires: yast2 >= 2.19.3
|
||||
#netconfig (FaTE #303618)
|
||||
Requires: sysconfig >= 0.71.2
|
||||
Requires: sysconfig >= 0.71.2
|
||||
#GetLanguageCountry
|
||||
#(in newly created yast2-country-data)
|
||||
Requires: yast2-country-data >= 2.16.3
|
||||
|
||||
PreReq: /bin/rm
|
||||
|
||||
Provides: 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
|
||||
Obsoletes: yast2-lib-network yast2-config-network
|
||||
Provides: yast2-trans-network yast2-trans-adsl
|
||||
Obsoletes: yast2-trans-network yast2-trans-adsl
|
||||
Provides: y2t_lan y2t_adsl y2t_dial
|
||||
Obsoletes: y2t_lan y2t_adsl y2t_dial
|
||||
|
||||
Requires: yast2-country-data >= 2.16.3
|
||||
PreReq: /bin/rm
|
||||
Provides: 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
|
||||
Obsoletes: yast2-lib-network yast2-config-network
|
||||
Provides: yast2-trans-network yast2-trans-adsl
|
||||
Obsoletes: yast2-trans-network yast2-trans-adsl
|
||||
Provides: y2t_lan y2t_adsl y2t_dial
|
||||
Obsoletes: y2t_lan y2t_adsl y2t_dial
|
||||
# carrier detection
|
||||
Conflicts: yast2-core < 2.10.6
|
||||
|
||||
Summary: YaST2 - Network Configuration
|
||||
Conflicts: yast2-core < 2.10.6
|
||||
Summary: YaST2 - Network Configuration
|
||||
|
||||
%package devel-doc
|
||||
License: GPLv2+
|
||||
Group: System/YaST
|
||||
Summary: YaST2 - Developer documentation for yast2-network
|
||||
|
||||
Summary: YaST2 - Developer documentation for yast2-network
|
||||
|
||||
%description
|
||||
This package contains the YaST2 component for network configuration.
|
||||
@ -59,16 +65,14 @@ This package contains the YaST2 component for network configuration.
|
||||
This package contains autogenerated documentation for yast2-network
|
||||
|
||||
%prep
|
||||
%setup -n yast2-network-2.19.13
|
||||
%setup -n yast2-network-2.19.11
|
||||
|
||||
%build
|
||||
%{prefix}/bin/y2tool y2autoconf
|
||||
%{prefix}/bin/y2tool y2automake
|
||||
autoreconf --force --install
|
||||
|
||||
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
|
||||
|
||||
%{?suse_update_config:%{suse_update_config -f}}
|
||||
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
|
||||
# V=1: verbose build in case we used AM_SILENT_RULES(yes)
|
||||
@ -82,7 +86,6 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk
|
||||
d=${f##*/}
|
||||
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
|
||||
done
|
||||
|
||||
%ifarch s390 s390x
|
||||
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/dsl.desktop
|
||||
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop
|
||||
@ -119,7 +122,6 @@ fi
|
||||
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc
|
||||
/usr/share/YaST2/schema/autoyast/rnc/host.rnc
|
||||
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
|
||||
|
||||
%dir %{prefix}/share/doc/packages/yast2-network
|
||||
%{prefix}/share/doc/packages/yast2-network/COPYING
|
||||
%readme %{prefix}/share/doc/packages/yast2-network/README
|
||||
@ -129,3 +131,4 @@ fi
|
||||
%doc %{prefix}/share/doc/packages/yast2-network
|
||||
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
|
||||
%exclude %{prefix}/share/doc/packages/yast2-network/README
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user