< Fri Jan 15 10:02:26 CET 2010 - mzugec@suse.cz
< 
< - allow bridge as ETHERDEVICE for VLAN (bnc#569970)
< - 2.19.7 
< 
< -------------------------------------------------------------------

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=60
This commit is contained in:
Michal Zugec 2010-01-15 09:01:46 +00:00 committed by Git OBS Bridge
parent 028e28d463
commit 04ce8b3e2e
5 changed files with 53 additions and 50 deletions

0
ready
View File

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:21e72b2256e9411969473b8ee2cae7e4c4ee7eb79f7445ae51d14d2c8fd841ce
size 327568

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c2d44af87bda1f065dc58cae0c5d5f4be95102f70830dd51422b50751926ecb1
size 314268

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 15 10:02:26 CET 2010 - mzugec@suse.cz
- allow bridge as ETHERDEVICE for VLAN (bnc#569970)
- 2.19.7
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 14 17:59:48 CET 2010 - mzugec@suse.cz Thu Jan 14 17:59:48 CET 2010 - mzugec@suse.cz

View File

@ -1,62 +1,56 @@
# #
# spec file for package yast2-network (Version 2.19.6) # spec file for package yast2-network (Version 2.19.7)
# #
# 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 # norootforbuild
Name: yast2-network
Version: 2.19.7
Release: 0
Name: yast2-network
Version: 2.19.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build
Release: 1 Source0: yast2-network-2.19.7.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-network-2.19.6.tar.bz2 prefix: /usr
Prefix: /usr
Group: System/YaST Group: System/YaST
License: GPLv2+ License: GPL v2 or later
# should be required by devtools # should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: pkgconfig perl-XML-Writer 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
Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl PreReq: /bin/rm
Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
Provides: yast2-lib-network yast2-config-network Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
Obsoletes: yast2-lib-network yast2-config-network Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
Provides: yast2-trans-network yast2-trans-adsl Provides: yast2-lib-network yast2-config-network
Obsoletes: yast2-trans-network yast2-trans-adsl Obsoletes: yast2-lib-network yast2-config-network
Provides: y2t_lan y2t_adsl y2t_dial Provides: yast2-trans-network yast2-trans-adsl
Obsoletes: y2t_lan y2t_adsl y2t_dial Obsoletes: yast2-trans-network yast2-trans-adsl
Provides: 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.
@ -65,14 +59,16 @@ This package contains the YaST2 component for network configuration.
This package contains autogenerated documentation for yast2-network This package contains autogenerated documentation for yast2-network
%prep %prep
%setup -n yast2-network-2.19.6 %setup -n yast2-network-2.19.7
%build %build
%{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2autoconf
%{prefix}/bin/y2tool y2automake %{prefix}/bin/y2tool y2automake
autoreconf --force --install autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}} %{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
# V=1: verbose build in case we used AM_SILENT_RULES(yes) # V=1: verbose build in case we used AM_SILENT_RULES(yes)
@ -86,6 +82,7 @@ for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desk
d=${f##*/} d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done done
%ifarch s390 s390x %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/dsl.desktop
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop /bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/isdn.desktop
@ -122,6 +119,7 @@ fi
/usr/share/YaST2/schema/autoyast/rnc/networking.rnc /usr/share/YaST2/schema/autoyast/rnc/networking.rnc
/usr/share/YaST2/schema/autoyast/rnc/host.rnc /usr/share/YaST2/schema/autoyast/rnc/host.rnc
/usr/share/YaST2/schema/autoyast/rnc/proxy.rnc /usr/share/YaST2/schema/autoyast/rnc/proxy.rnc
%dir %{prefix}/share/doc/packages/yast2-network %dir %{prefix}/share/doc/packages/yast2-network
%{prefix}/share/doc/packages/yast2-network/COPYING %{prefix}/share/doc/packages/yast2-network/COPYING
%readme %{prefix}/share/doc/packages/yast2-network/README %readme %{prefix}/share/doc/packages/yast2-network/README
@ -131,4 +129,3 @@ 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