- skip USB NICs during bridge proposal (bnc#710098)

- do not inherit for new bridge port devices PREFIXLEN (bnc#735109)
- do not inherit for bridge device ETHTOOLS_OPTIONS (bnc#735109) 
- Filter out Chelsio devices without device file (bnc#711432) 
- Only save LLADDR (persistent MAC) for some s390 card types
  (bnc#658708).
- 2.22.0

- Moved NetworkStorage from yast2.rpm to yast2-network.rpm
  (bnc#726057)
- Use Storage::IsDeviceOnNetwork instead of trying to do it
  ourselves, wrong (bnc#726057).

OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=155
This commit is contained in:
Martin Vidner 2012-01-06 15:26:55 +00:00 committed by Git OBS Bridge
parent 1f977c1e79
commit 24d1e39bda
4 changed files with 48 additions and 30 deletions

View File

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

View File

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

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Fri Jan 6 16:17:00 CET 2012 - mvidner@suse.cz
- skip USB NICs during bridge proposal (bnc#710098)
- do not inherit for new bridge port devices PREFIXLEN (bnc#735109)
- do not inherit for bridge device ETHTOOLS_OPTIONS (bnc#735109)
- Filter out Chelsio devices without device file (bnc#711432)
- Only save LLADDR (persistent MAC) for some s390 card types
(bnc#658708).
- 2.22.0
-------------------------------------------------------------------
Fri Jan 6 14:47:16 CET 2012 - mvidner@suse.cz
- Moved NetworkStorage from yast2.rpm to yast2-network.rpm
(bnc#726057)
- Use Storage::IsDeviceOnNetwork instead of trying to do it
ourselves, wrong (bnc#726057).
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 22 11:24:51 CEST 2011 - visnov@suse.cz Thu Sep 22 11:24:51 CEST 2011 - visnov@suse.cz

View File

@ -1,7 +1,7 @@
# #
# spec file for package yast2-network # spec file for package yast2-network
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,20 +15,17 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: yast2-network Name: yast2-network
Version: 2.21.8 Version: 2.22.0
Release: 0 Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-network-2.21.8.tar.bz2 Source0: yast2-network-%{version}.tar.bz2
Prefix: /usr
Group: System/YaST Group: System/YaST
License: GPL v2 or later License: GPL-2.0+
# should be required by devtools # should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
@ -46,6 +43,9 @@ 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
# Storage::IsDeviceOnNetwork
BuildRequires: yast2-storage >= 2.21.11
Requires: yast2-storage >= 2.21.11
PreReq: /bin/rm PreReq: /bin/rm
@ -74,37 +74,36 @@ 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.21.8 %setup -n yast2-network-%{version}
%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}} ./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)
# so that RPM_OPT_FLAGS check works # so that RPM_OPT_FLAGS check works
make %{?jobs:-j%jobs} V=1 make %{?jobs:-j%jobs} V=1
%install %install
make install DESTDIR="$RPM_BUILD_ROOT" make install DESTDIR="$RPM_BUILD_ROOT"
[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" [ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do
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
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/modem.desktop /bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/modem.desktop
%endif %endif
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/network.desktop /bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/network.desktop
/bin/rm -f $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/provider.desktop /bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/provider.desktop
%clean %clean
rm -rf "$RPM_BUILD_ROOT" rm -rf "$RPM_BUILD_ROOT"
@ -121,28 +120,28 @@ fi
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{prefix}/lib/YaST2/bin/* %{_prefix}/lib/YaST2/bin/*
/usr/share/YaST2/data/* /usr/share/YaST2/data/*
/usr/share/YaST2/include/network /usr/share/YaST2/include/network
/usr/share/YaST2/clients/*.ycp /usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/YaPI/NETWORK.pm /usr/share/YaST2/modules/YaPI/NETWORK.pm
/usr/share/YaST2/modules/*.ycp /usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc /usr/share/YaST2/modules/*.ybc
%{prefix}/share/applications/YaST2/*.desktop %{_prefix}/share/applications/YaST2/*.desktop
/usr/share/YaST2/scrconf/*.scr /usr/share/YaST2/scrconf/*.scr
/usr/lib/YaST2/servers_non_y2/ag_udev_persistent /usr/lib/YaST2/servers_non_y2/ag_udev_persistent
/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
%files devel-doc %files devel-doc
%defattr(-,root,root) %defattr(-,root,root)
%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 %changelog