From nobody Sun May 5 21:38:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578407879; cv=none; d=zohomail.com; s=zohoarc; b=Ohe9P7jo40LQ9QXu9VBhkeQ9f6EOIxRWFaS75PLmifZ7JB2qTWWfAY58+g4v7439WRQE2tkVvLnxqj2WkMgd6mUTGyCdioIlft+w+oHhlszppB0nl+p3RiSwGEPmgYDwL1rgf/VvMdaQu6bjbdIyjEL+JhcIoQl2xLXP8nM0dfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578407879; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=/v/CyoNRoyt2sK7DT+fSpy3AnnRffXKbZpRRAJHHpOQ=; b=gheP2/+8NUOiiLGVaUc57SjaAQXb7kXs/B7IoZBiSqJQ5JuA001nRGNt5NJ/3a3+oq/kYgtXWJgSvVIPoQ8E+SSuLht6lq0cEbpHqisOGPxCqIUg1cA8CmFKwG+0MLzijvHDrcogNk5B2/MK/vl53KotaJ0WZ1JxaIJozmCvZ1M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578407879055113.02480452604232; Tue, 7 Jan 2020 06:37:59 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-328-sju_cyRANcG2Z7W_jPLQUQ-1; Tue, 07 Jan 2020 09:37:56 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 650F2801E6C; Tue, 7 Jan 2020 14:37:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEFEB60C88; Tue, 7 Jan 2020 14:37:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0A31281C91; Tue, 7 Jan 2020 14:37:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 007EbmFc031043 for ; Tue, 7 Jan 2020 09:37:48 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7606B7C004; Tue, 7 Jan 2020 14:37:48 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id F23247BFFA for ; Tue, 7 Jan 2020 14:37:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578407877; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/v/CyoNRoyt2sK7DT+fSpy3AnnRffXKbZpRRAJHHpOQ=; b=Vx9cf9xVmipUQT77LHIe3GQ+FD8aH9aNm2TbnR8gVrGXJrPC29b6Oejfjy1LTm1Y7tCqF2 zyWJMg0zko8sN0wTosAhs2qeY3UMY9urnXVfMia4vlRNFBvU5BTc9CTXsnrITvJuzgUci8 qRroY/n8QLiKtft0wyv56YgRuq6PVtA= From: Pavel Hrdina To: libvir-list@redhat.com Date: Tue, 7 Jan 2020 15:37:44 +0100 Message-Id: <97ffe24d13b9ef16323beb892569b95bc5746dfd.1578407853.git.phrdina@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] po/Makefile.am: use SOURCE_DATE_EPOCH to set POT creation date X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: sju_cyRANcG2Z7W_jPLQUQ-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" When building RPMs for libvirt the PO files are part of libvirt-libs package. Now that we generate libvirt.pot during build time the POT creation date is also generated at that time. The issue here is that when building libvirt-libs for x86_64 and i686 the generated libvirt.pot file will have different POT creation date which affects installed PO files as well which leads to conflict when installing both x86_64 and i686 packages. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 --- po/Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/po/Makefile.am b/po/Makefile.am index 443d8a4dc1..277dd89d7d 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -45,10 +45,19 @@ XGETTEXT_ARGS =3D \ --msgid-bugs-address=3D"$(MSGID_BUGS_ADDRESS)" \ $(NULL) =20 +POT_CREATION_DATE =3D $(shell \ + if test -n "$$SOURCE_DATE_EPOCH"; \ + then \ + date --date=3D"@$$SOURCE_DATE_EPOCH" +"%F %R%z"; \ + else \ + date +'%F %R%z'; \ + fi) + SED_PO_FIXUP_ARGS =3D \ -e "s|text/plain; charset=3DCHARSET|text/plain; charset=3DUTF-8|g" \ -e "s|SOME DESCRIPTIVE TITLE|Libvirt package strings|g" \ -e "s|Copyright (C) YEAR|Copyright (C) $$(date +'%Y')|" \ + -e "s|POT-Creation-Date:[^\]*|POT-Creation-Date: $(POT_CREATION_DAT= E)|" \ $(NULL) =20 update-po: $(POFILES) --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list