diff --git a/.gitignore b/.gitignore index 789843e..78715a0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zypper-1.13.30.tar.gz /zypper-1.13.31.tar.gz /zypper-1.13.32.tar.gz +/zypper-1.14.2.tar.gz diff --git a/0001-Fix-template-to-compile-fixes-146.patch b/0001-Fix-template-to-compile-fixes-146.patch new file mode 100644 index 0000000..9cdaa3b --- /dev/null +++ b/0001-Fix-template-to-compile-fixes-146.patch @@ -0,0 +1,25 @@ +From 7d3a784a8ca003a14a86859d8e16a6868c6754b9 Mon Sep 17 00:00:00 2001 +From: Michael Andres +Date: Wed, 7 Feb 2018 09:57:59 +0100 +Subject: [PATCH] Fix template to compile (fixes #146) + +--- + src/callbacks/rpm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/callbacks/rpm.h b/src/callbacks/rpm.h +index d8aeee76..c8492bc2 100644 +--- a/src/callbacks/rpm.h ++++ b/src/callbacks/rpm.h +@@ -121,7 +121,7 @@ namespace out + private: + template + static sat::Solvable asSolvable( const Tp_ & val_r ) +- { return sat::asSolvable( val_r ); } ++ { return sat::asSolvable()( val_r ); } + + static sat::Solvable asSolvable( int val_r ) // e.g. satQueues use int as SolvabeId + { return sat::Solvable( val_r ); } +-- +2.14.3 + diff --git a/sources b/sources index 967b408..6eb3839 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.13.32.tar.gz) = 231090120b0893b38016b0a504c11b67e4987e05f37d6ae88eafdc9f6747c9d4d21c1e1217331089513de4f46366c2f76f0cdb3228b9f1246501683bc7a43de9 +SHA512 (zypper-1.14.2.tar.gz) = 6679f9a4956355dd4fe5c4df6c5caacfebbf82d21d5af8de65bbfd362b024bb96baad9a8111177d2e6355c934bb3dbc4ed1e0d8d0c8d39e790eb8743332e7a33 diff --git a/zypper.spec b/zypper.spec index b6cafd3..1cff677 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 16.15.4 +%global min_libzypp_ver 17.0.2 Name: zypper -Version: 1.13.32 +Version: 1.14.2 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -9,6 +9,10 @@ License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz +# Fix build with GCC 8 +# From: https://github.com/openSUSE/zypper/commit/7d3a784a8ca003a14a86859d8e16a6868c6754b9 +Patch0001: 0001-Fix-template-to-compile-fixes-146.patch + BuildRequires: perl-generators BuildRequires: cmake BuildRequires: augeas-devel @@ -74,15 +78,15 @@ find -type f -exec sed -i -e "s|\${CMAKE_INSTALL_PREFIX}/lib/\${PACKAGE}|\${CMAK find -type f -exec sed -i -e "s|\${INSTALL_PREFIX}/share/doc/packages/\${PACKAGE}|\${INSTALL_PREFIX}/share/doc/\${PACKAGE}|g" {} ';' %build -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -%make_build -%make_build -C po translations -%make_build -C tests +%cmake . -B"%{_vpath_builddir}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} +%make_build -C %{_vpath_builddir} +%make_build -C %{_vpath_builddir}/po translations +%make_build -C %{_vpath_builddir}/tests %install -%make_install -%make_install -C po +%make_install -C %{_vpath_builddir} +%make_install -C %{_vpath_builddir}/po mkdir -p %{buildroot}%{_libexecdir}/zypper/commands @@ -98,7 +102,7 @@ rm %{buildroot}%{_bindir}/apt-get ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt-get # Fix shebang for zypper-log -sed -e "s|/usr/bin/env python|/usr/bin/python|g" -i %{buildroot}%{_sbindir}/zypper-log +sed -e "s|/usr/bin/env python|/usr/bin/python|g" -i %{buildroot}%{_sbindir}/zypper-log # Move the bash completion file mkdir -p %{buildroot}%{_datadir}/bash-completion/completions @@ -107,8 +111,8 @@ rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/ %check -pushd tests -ctest . +pushd %{_vpath_builddir}/tests +ctest -VV . popd %files -f %{name}.lang @@ -139,6 +143,10 @@ popd %changelog +* Wed Feb 07 2018 Neal Gompa - 1.14.2-1 +- Update to 1.14.2 (#1489428) +- Backport patch to fix build with GCC 8 + * Sun Sep 03 2017 Neal Gompa - 1.13.32-1 - Update to 1.13.32 (#1485336)