From 9eebc1056e0b2deaf86cea662a11a360ca1381eec86b5f67e4aac0cf42a21823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 21 Mar 2016 09:04:26 +0000 Subject: [PATCH] Accepting request 376293 from home:bmwiedemann:branches:server:irc - Fix build-compare - include .changes file as Source so that .src.rpm can be rebuilt OBS-URL: https://build.opensuse.org/request/show/376293 OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=71 --- weechat.changes | 6 ++++++ weechat.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/weechat.changes b/weechat.changes index 9fa9be1..5886b6a 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 20 18:45:20 UTC 2016 - bwiedemann@suse.com + +- Fix build-compare +- include .changes file as Source so that .src.rpm can be rebuilt + ------------------------------------------------------------------- Thu Feb 18 11:58:33 UTC 2016 - mimi.vx@gmail.com diff --git a/weechat.spec b/weechat.spec index b43ee43..cf40428 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,7 +1,7 @@ # # spec file for package weechat # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,7 +16,6 @@ # - Name: weechat Version: 1.4 Release: 0 @@ -28,6 +27,7 @@ Source: http://weechat.org/files/src/%{name}-%{version}.tar.bz2 Source1: weechat.desktop Source2: %{name}.keyring Source3: %{name}-%{version}.tar.bz2.asc +Source4: %{name}.changes BuildRequires: asciidoc BuildRequires: ca-certificates BuildRequires: cmake @@ -151,10 +151,15 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q -modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" +modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE4}")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -name '*.[ch]' | xargs sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" +DATEF="\"$(date -d "${modified}" "+%%F")\"" +sed -i "s/date=.*/date=$DATEF/" doc/asciidoc.conf +sed -i "s/A2X_EXECUTABLE.*/& -a revdate=$DATEF/" doc/*/CMakeLists.txt +YEAR=$(date -d "${modified}" +%%Y) +sed -i "s/{sys:date \"+%%Y\"}/${YEAR}/" doc/*/weechat.1.*.asciidoc %build export CFLAGS="%{optflags}"