From 2a0f0553537f3a380d0d00780e33b6bf67d84ba4217ab5b729f16fafd29eadd6 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 26 Oct 2009 16:23:01 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-network?expand=0&rev=37 --- ready | 0 yast2-network-2.18.51.tar.bz2 | 3 ++ yast2-network-2.18.52.tar.bz2 | 3 -- yast2-network.changes | 11 ----- yast2-network.spec | 91 ++++++++++++++++++----------------- 5 files changed, 50 insertions(+), 58 deletions(-) create mode 100644 ready create mode 100644 yast2-network-2.18.51.tar.bz2 delete mode 100644 yast2-network-2.18.52.tar.bz2 diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 diff --git a/yast2-network-2.18.51.tar.bz2 b/yast2-network-2.18.51.tar.bz2 new file mode 100644 index 0000000..8d6d927 --- /dev/null +++ b/yast2-network-2.18.51.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:445c2f07912009fc6f59d0e5d0c1edbfce07a669a9bec8afb4eb1499c401c078 +size 335769 diff --git a/yast2-network-2.18.52.tar.bz2 b/yast2-network-2.18.52.tar.bz2 deleted file mode 100644 index cae8547..0000000 --- a/yast2-network-2.18.52.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ed8c1172077b8e086689e6f9847423b45fa89683758068452e0ff1b593ee79e -size 300238 diff --git a/yast2-network.changes b/yast2-network.changes index f184d08..ee64500 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -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 diff --git a/yast2-network.spec b/yast2-network.spec index 666868c..c680374 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -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