diff --git a/vlc.changes b/vlc.changes index 91d3ec3..0f0e60e 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 4 10:11:09 UTC 2015 - dimstar@opensuse.org + +- Add vlc.changes as source so that we can reliably access it + during build, even when using the .src.rpm. + ------------------------------------------------------------------- Thu Jan 22 15:03:10 UTC 2015 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index 552f813..3ef515f 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,7 +1,7 @@ # # spec file for package vlc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -41,6 +41,8 @@ Version: 2.1.5 Release: 0 Url: http://www.videolan.org/ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz +# Add vlc.changes as source, so we can reproducibly extract the date from it during build +Source1: %{name}.changes # PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch # PATCH-FIX-UPSTREAM vlc-CVE-2014-9625.patch boo#914268 CVE-2014-9625 dimstar@opensuse.org -- Fix various buffer overflows and null ptr deref @@ -299,7 +301,6 @@ Conflicts: %{conflicts}-gnome In order to integrate flawless into GNOME, there are some access modules for gnome-vfs2. -%prep %setup -q %patch1 -p1 %patch2 -p1 @@ -308,8 +309,8 @@ for gnome-vfs2. rm -rf contrib # fix builddate info # Remove build time references so build-compare can do its work -FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') -FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{S:1} '+%%H:%%M') +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{S:1} '+%%b %%e %%Y') sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c