diff --git a/yast2-network-3.0.7.tar.bz2 b/yast2-network-3.0.7.tar.bz2 deleted file mode 100644 index 6f90fed..0000000 --- a/yast2-network-3.0.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:108878feffaee9540344734222be241be36664a384f07ad4029a38f28456eb66 -size 294255 diff --git a/yast2-network-3.1.2.tar.bz2 b/yast2-network-3.1.2.tar.bz2 new file mode 100644 index 0000000..a883047 --- /dev/null +++ b/yast2-network-3.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c09914d6e54dfc5538697fc8fe8d99e2aba9c9d57d976212a67d67da351741c +size 281511 diff --git a/yast2-network.changes b/yast2-network.changes index a63fc5a..abd8408 100644 --- a/yast2-network.changes +++ b/yast2-network.changes @@ -1,10 +1,34 @@ +------------------------------------------------------------------- +Wed Oct 16 07:09:13 UTC 2013 - mfilka@suse.com + +- bnc#845534 + - fixed internal error which appeared when attempting to add an + alias +- 3.1.2 + +------------------------------------------------------------------- +Wed Sep 25 07:00:21 UTC 2013 - mfilka@suse.com + +- bnc#572202 + - separated IP forwarding enablement for IPv4 and IPv6 because + IPv6 forwarding disables IPv6 stateless address autoconfiguration + (SLAAC) +- 3.1.1 + +------------------------------------------------------------------- +Thu Sep 19 11:23:14 UTC 2013 - lslezak@suse.cz + +- do not use *.spec.in template, use *.spec file with RPM macros + instead +- 3.1.0 + ------------------------------------------------------------------- Wed Sep 18 09:12:23 UTC 2013 - mfilka@suse.com - Refactoring - removing ycp artifacts - separated dialog for editing nic name into own class -- 3.0.7 +- 3.0.7 ------------------------------------------------------------------- Wed Sep 11 09:34:47 UTC 2013 - mfilka@suse.com diff --git a/yast2-network.spec b/yast2-network.spec index e2a5a3b..f71ca3a 100644 --- a/yast2-network.spec +++ b/yast2-network.spec @@ -17,11 +17,11 @@ Name: yast2-network -Version: 3.0.7 +Version: 3.1.2 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 # should be required by devtools BuildRequires: perl-XML-Writer @@ -29,7 +29,7 @@ BuildRequires: pkgconfig BuildRequires: rpm BuildRequires: update-desktop-files BuildRequires: yast2-country -BuildRequires: yast2-devtools +BuildRequires: yast2-devtools >= 3.0.6 BuildRequires: yast2-installation >= 2.15.27 BuildRequires: yast2-testsuite @@ -49,6 +49,9 @@ Requires: yast2-country-data >= 2.16.3 BuildRequires: yast2-storage >= 2.21.11 Requires: yast2-storage >= 2.21.11 +# testsuite +BuildRequires: rubygem-rspec + PreReq: /bin/rm # carrier detection @@ -71,39 +74,21 @@ This package contains the YaST2 component for network configuration. This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-%{version} +%setup -n %{name}-%{version} %build -%{_prefix}/bin/y2tool y2autoconf -%{_prefix}/bin/y2tool y2automake -autoreconf --force --install - -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" -export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" - -./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} -# V=1: verbose build in case we used AM_SILENT_RULES(yes) -# so that RPM_OPT_FLAGS check works -make %{?jobs:-j%jobs} V=1 +%yast_build %install -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" -for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do - d=${f##*/} - %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} -done +%yast_install %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 -/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/modem.desktop +/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/dsl.desktop +/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/isdn.desktop +/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/modem.desktop %endif -/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/network.desktop -/bin/rm -f $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/provider.desktop - -%clean -rm -rf "$RPM_BUILD_ROOT" +/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/network.desktop +/bin/rm -f $RPM_BUILD_ROOT/%{yast_desktopdir}/provider.desktop %post -p /bin/bash # This fixes the files that were touched when #24842 was in effect. @@ -117,28 +102,27 @@ fi %files %defattr(-,root,root) -%{_prefix}/lib/YaST2/bin/* -/usr/share/YaST2/data/* -/usr/share/YaST2/include/network -/usr/share/YaST2/clients/*.rb -/usr/share/YaST2/modules/YaPI/NETWORK.pm -/usr/share/YaST2/modules/*.rb -%{_prefix}/share/applications/YaST2/*.desktop -/usr/share/YaST2/scrconf/*.scr -/usr/lib/YaST2/servers_non_y2/ag_udev_persistent -/usr/share/YaST2/schema/autoyast/rnc/networking.rnc -/usr/share/YaST2/schema/autoyast/rnc/host.rnc -/usr/share/YaST2/lib/ -/usr/share/YaST2/lib/network +%{yast_ybindir}/* +%{yast_ydatadir}/* +%{yast_yncludedir}/network +%{yast_clientdir}/*.rb +%{yast_moduledir}/YaPI/NETWORK.pm +%{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 +%dir %{_datadir}/YaST2/lib/ +%{_datadir}/YaST2/lib/network/ -%dir %{_prefix}/share/doc/packages/yast2-network -%{_prefix}/share/doc/packages/yast2-network/COPYING -%readme %{_prefix}/share/doc/packages/yast2-network/README +%dir %{yast_docdir} +%{yast_docdir}/COPYING %files devel-doc %defattr(-,root,root) -%doc %{_prefix}/share/doc/packages/yast2-network -%exclude %{_prefix}/share/doc/packages/yast2-network/COPYING -%exclude %{_prefix}/share/doc/packages/yast2-network/README +%doc %{yast_docdir} +%exclude %{yast_docdir}/COPYING +%exclude %{yast_docdir}/README %changelog