commit jigdo for openSUSE:Factory

Hello community, here is the log from the commit of package jigdo for openSUSE:Factory checked in at 2017-03-20 17:10:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jigdo (Old) and /work/SRC/openSUSE:Factory/.jigdo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jigdo" Mon Mar 20 17:10:14 2017 rev:6 rq:481010 version:0.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/jigdo/jigdo.changes 2012-01-05 13:48:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.jigdo.new/jigdo.changes 2017-03-20 17:10:14.944056136 +0100 @@ -1,0 +2,5 @@ +Sat Mar 18 10:06:28 UTC 2017 - astieger@suse.com + +- fix factory build, add jigdo-0.7.3-gcc7.patch from Fedora + +------------------------------------------------------------------- New: ---- jigdo-0.7.3-gcc7.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jigdo.spec ++++++ --- /var/tmp/diff_new_pack.OMnmVM/_old 2017-03-20 17:10:15.547970863 +0100 +++ /var/tmp/diff_new_pack.OMnmVM/_new 2017-03-20 17:10:15.551970299 +0100 @@ -1,7 +1,7 @@ # # spec file for package jigdo # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,22 +17,23 @@ Name: jigdo -BuildRequires: gcc-c++ -BuildRequires: libbz2-devel -BuildRequires: libdb-4_5-devel -BuildRequires: zlib-devel -Url: http://atterer.org/jigdo/ +Version: 0.7.3 +Release: 0 Summary: Jigsaw Download License: GPL-2.0 Group: Productivity/Networking/Other -Version: 0.7.3 -Release: 0 +Url: http://atterer.org/jigdo/ Source: %{name}-%{version}.tar.bz2 Patch1: jigdo-0.7.3-makefile-do-not-strip.patch Patch2: jigdo-0.7.3-makefile-paths.patch Patch3: jigdo-0.7.3-add-includes.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch4: jigdo-0.7.3-gcc7.patch +BuildRequires: gcc-c++ +BuildRequires: libbz2-devel +BuildRequires: libdb-4_5-devel +BuildRequires: zlib-devel Requires: wget +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Jigsaw Download, or jigdo, is an intelligent tool that can be used on @@ -45,17 +46,12 @@ of the CD on an FTP server--when jigdo is presented the files along with the template you generated, it is able to recreate the CD image. - - -Authors: --------- - Richard Atterer - %prep %setup -q %patch1 %patch2 %patch3 +%patch4 -p1 %build %configure \ @@ -64,15 +60,12 @@ --mandir=%{_mandir} \ --with-gui=no -%__make +make %{?_smp_mflags} %install -%makeinstall +%make_install %find_lang %{name} -%clean -%__rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang %defattr(-, root, root) %doc changelog COPYING README THANKS doc/*.html doc/*.txt ++++++ jigdo-0.7.3-gcc7.patch ++++++

From d3af5d2fd6962f8f6779c4187792dc2dc21d1afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Fri, 17 Feb 2017 15:01:48 +0100 Subject: Add jigdo-0.7.3-gcc7.patch (Fix F26FTBFS).

rename SIZE_WIDTH into size_width to avoid preprocessor symbol clash with c++14/gcc7 --- jigdo-0.7.3-gcc7.patch | 39 +++++++++++++++++++++++++++++++++++++++ jigdo.spec | 10 +++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 jigdo-0.7.3-gcc7.patch Index: jigdo-0.7.3/src/mkimage.cc =================================================================== --- jigdo-0.7.3.orig/src/mkimage.cc +++ jigdo-0.7.3/src/mkimage.cc @@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& fi //______________________________________________________________________ namespace { - const int SIZE_WIDTH = 12; + const int size_width = 12; } ostream& JigdoDesc::ImageInfo::put(ostream& s) const { - s << "image-info " << setw(SIZE_WIDTH) << size() << " " + s << "image-info " << setw(size_width) << size() << " " << md5() << ' ' << blockLength() << '\n'; return s; } ostream& JigdoDesc::UnmatchedData::put(ostream& s) const { - s << "in-template " << setw(SIZE_WIDTH) << offset() << ' ' - << setw(SIZE_WIDTH) << size() << '\n'; + s << "in-template " << setw(size_width) << offset() << ' ' + << setw(size_width) << size() << '\n'; return s; } ostream& JigdoDesc::MatchedFile::put(ostream& s) const { - s << "need-file " << setw(SIZE_WIDTH) << offset() << ' ' - << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; + s << "need-file " << setw(size_width) << offset() << ' ' + << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n'; return s; } ostream& JigdoDesc::WrittenFile::put(ostream& s) const { - s << "have-file " << setw(SIZE_WIDTH) << offset() << ' ' - << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; + s << "have-file " << setw(size_width) << offset() << ' ' + << setw(size_width) << size() << ' ' << md5() << ' ' << rsync() << '\n'; return s; }