diff --git a/yast2-network-4.2.3.tar.bz2 b/yast2-network-4.2.3.tar.bz2 deleted file mode 100644 index 5fcafc8..0000000 --- a/yast2-network-4.2.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efe56a4514ae447d3f2c4efcaca3614c8b5100a4783e3edf776f7df1fffa0607 -size 404679 diff --git a/yast2-network-4.2.4.tar.bz2 b/yast2-network-4.2.4.tar.bz2 new file mode 100644 index 0000000..3298fc3 --- /dev/null +++ b/yast2-network-4.2.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f9da333cfc18c612b4d7c80e19fea05f0fe733a010357313cdb657f108508b34 +size 404543 diff --git a/yast2-network.changes b/yast2-network.changes index 371230c..c1e8eef 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 7 23:57:54 UTC 2019 - Stasiek Michalski + +- Use new schema of desktop files (boo#1084864) +- Clean up spec +- Rename desktop files +- 4.2.4 + ------------------------------------------------------------------- Mon May 20 14:04:47 UTC 2019 - Michal Filka diff --git a/yast2-network.spec b/yast2-network.spec index b82be0b..fe6085c 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -17,60 +17,54 @@ Name: yast2-network -Version: 4.2.3 +Version: 4.2.4 Release: 0 -BuildArch: noarch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Summary: YaST2 - Network Configuration +License: GPL-2.0-only +Group: System/YaST Url: https://github.com/yast/yast-network + Source0: %{name}-%{version}.tar.bz2 +# testsuite BuildRequires: update-desktop-files BuildRequires: yast2-devtools >= 3.1.15 -Requires: yast2-proxy +BuildRequires: rubygem(%rb_default_ruby_abi:rspec) #for install task +BuildRequires: yast2-storage-ng BuildRequires: rubygem(%rb_default_ruby_abi:yast-rake) - # Y2Firewall interface zone mapping methods BuildRequires: yast2 >= 4.1.53 -Requires: yast2 >= 4.1.53 - +BuildRequires: yast2-packager >= 4.0.18 # Product control need xml agent BuildRequires: yast2-xml -Requires: yast2-xml - -#netconfig (FaTE #303618) -Requires: sysconfig >= 0.80.0 -BuildRequires: yast2-storage-ng -Requires: yast2-storage-ng -# Packages::vnc_packages -Requires: yast2-packager >= 4.0.18 -BuildRequires: yast2-packager >= 4.0.18 # cfa for parsing hosts BuildRequires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.4 -Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.4 # lenses are needed to use cfa BuildRequires: augeas-lenses -Requires: augeas-lenses -# BusID of all the cards with the same one (bsc#1007172) -Requires: hwinfo >= 21.35 - -# testsuite -BuildRequires: rubygem(%rb_default_ruby_abi:rspec) PreReq: /bin/rm +#netconfig (FaTE #303618) +Requires: sysconfig >= 0.80.0 +Requires: yast2 >= 4.1.53 +Requires: yast2-proxy +Requires: yast2-storage-ng +# Packages::vnc_packages +Requires: augeas-lenses +Requires: yast2-packager >= 4.0.18 +Requires: rubygem(%rb_default_ruby_abi:cfa) >= 0.6.4 +# BusID of all the cards with the same one (bsc#1007172) +Requires: hwinfo >= 21.35 +Requires: yast2-ruby-bindings >= 1.0.0 +Requires: yast2-xml # carrier detection Conflicts: yast2-core < 2.10.6 -Requires: yast2-ruby-bindings >= 1.0.0 - Obsoletes: yast2-network-devel-doc <= 3.1.154 Provides: yast2-network-devel-doc = %{version} -Summary: YaST2 - Network Configuration -License: GPL-2.0-only -Group: System/YaST +BuildArch: noarch %build @@ -78,33 +72,28 @@ Group: System/YaST This package contains the YaST2 component for network configuration. %prep -%setup -n %{name}-%{version} +%setup -q %check -rake test:unit +%yast_check %install -rake install DESTDIR="%{buildroot}" +%yast_install +%yast_metainfo %files -%defattr(-,root,root) -%{yast_yncludedir}/network -%{yast_clientdir}/*.rb -%{yast_moduledir}/*.rb -%{yast_desktopdir}/*.desktop -%{yast_scrconfdir}/*.scr -%{yast_agentdir}/ag_udev_persistent -%{yast_schemadir}/autoyast/rnc/networking.rnc -%{yast_schemadir}/autoyast/rnc/host.rnc -%{yast_libdir}/network -%{yast_libdir}/y2network -%{yast_libdir}/y2remote -%{yast_libdir}/cfa/ -%{yast_ydatadir}/network +%{yast_yncludedir} +%{yast_clientdir} +%{yast_moduledir} +%{yast_desktopdir} +%{yast_scrconfdir} +%{yast_agentdir} +%{yast_schemadir} +%{yast_libdir} +%{yast_ydatadir} %{yast_icondir} -%dir %{yast_docdir} -%doc %{yast_docdir}/CONTRIBUTING.md +%{yast_metainfodir} %license COPYING -%doc %{yast_docdir}/README.md +%doc %{yast_docdir} %changelog