Hello community, here is the log from the commit of package criu for openSUSE:Factory checked in at 2015-08-01 11:39:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/criu (Old) and /work/SRC/openSUSE:Factory/.criu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "criu" Changes: -------- --- /work/SRC/openSUSE:Factory/criu/criu.changes 2015-06-02 10:11:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.criu.new/criu.changes 2015-08-01 11:39:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 31 07:47:22 UTC 2015 - [email protected] + +- Fix version in criu.pc file. + 4c5b23e5-criu.pc.diff + +------------------------------------------------------------------- New: ---- 4c5b23e5-criu.pc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ criu.spec ++++++ --- /var/tmp/diff_new_pack.fSRXHH/_old 2015-08-01 11:39:14.000000000 +0200 +++ /var/tmp/diff_new_pack.fSRXHH/_new 2015-08-01 11:39:14.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package criu # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -27,6 +27,7 @@ Source0: http://download.openvz.org/criu/criu-%{package_version}.tar.bz2 Patch1: crit-install-prefix.diff Patch2: lsm-prototype-fix.diff +Patch3: 4c5b23e5-criu.pc.diff BuildRequires: asciidoc BuildRequires: pkg-config BuildRequires: protobuf-c @@ -68,6 +69,7 @@ %setup -q -n %{name}-%{package_version} %patch1 -p1 %patch2 -p1 +%patch3 -p1 # fix up the broken protobuf descriptor.proto (comment-in-comment) rm -f protobuf/google/protobuf/descriptor.proto sed -e's@/\*@@g' -e's@\*/@@g' /usr/include/google/protobuf/descriptor.proto > protobuf/google/protobuf/descriptor.proto ++++++ 4c5b23e5-criu.pc.diff ++++++ >From 4c5b23e52c1dc4e3fbbc7472b92e7b1ce9d22f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <[email protected]> Date: Thu, 30 Jul 2015 18:44:00 +0300 Subject: [PATCH] Fix criu.pc version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use CRTOOLSVERSION instead of GITID to write criu.pc version. With GITID, criu.pc had version '0' when built from tarballs. Signed-off-by: Cédric Bosdonnat <[email protected]> Acked-by: Tycho Andersen <[email protected]> Signed-off-by: Pavel Emelyanov <[email protected]> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6ed4c90..7f5c890 100644 --- a/Makefile +++ b/Makefile @@ -339,7 +339,7 @@ install-criu: $(PROGRAM) $(CRIU-LIB) install-crit $(Q) install -m 644 scripts/sd/criu.service $(DESTDIR)$(SYSTEMDUNITDIR) $(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR) $(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR) - $(Q) sed -e 's,@version@,$(GITID),' \ + $(Q) sed -e 's,@version@,$(CRTOOLSVERSION),' \ -e 's,@libdir@,$(LIBDIR),' \ -e 's,@includedir@,$(dir $(INCLUDEDIR)),' \ lib/criu.pc.in > criu.pc -- 2.1.4
