OBS User autobuild 2009-10-26 16:23:01 +00:00 committed by Git OBS Bridge
parent 9a14d71129
commit 2a0f055353
5 changed files with 50 additions and 58 deletions

0
ready Normal file
View File

View File

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

View File

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

View File

@ -1,14 +1,3 @@
-------------------------------------------------------------------
Mon Oct 26 16:00:33 CET 2009 - mzugec@suse.cz
- show BusID in lan description (FaTE#307165)
- 2.18.52
-------------------------------------------------------------------
Tue Oct 20 13:20:12 CEST 2009 - mzugec@suse.cz
- missing space in translated text (bnc#545074)
-------------------------------------------------------------------
Tue Oct 20 11:28:01 CEST 2009 - mzugec@suse.cz

View File

@ -1,56 +1,62 @@
#
# spec file for package yast2-network (Version 2.18.52)
# spec file for package yast2-network (Version 2.18.51)
#
# Copyright (c) 2009 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.18.52
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-network-2.18.52.tar.bz2
prefix: /usr
Group: System/YaST
License: GPL v2 or later
Name: yast2-network
Version: 2.18.51
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-network-2.18.51.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
# 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: yast2 >= 2.16.6
BuildRequires: perl-XML-Writer pkgconfig rpm
BuildRequires: update-desktop-files
BuildRequires: yast2-devtools yast2-testsuite
BuildRequires: yast2-country
BuildRequires: yast2-installation >= 2.15.27
BuildRequires: yast2 >= 2.16.6
# ProductControl::Disable* - yast2-2.18.23
Requires: yast2 >= 2.18.23
Requires: yast2 >= 2.18.23
#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: GPL v2 or later
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.18.52
%setup -n yast2-network-2.18.51
%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