[packages/shotwell] Fix build. Release 2.
megabajt
megabajt at pld-linux.org
Thu Oct 27 21:16:35 CEST 2016
commit 2cfd30788bb02cc1e9a90154ebe20a69515bddb3
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Thu Oct 27 21:10:55 2016 +0200
Fix build. Release 2.
- added -gitversion patch which ensures that we don't set git version for
distro build
- removed Resources.c that should be generated at build time from vala
source file.
shotwell-gitversion.patch | 11 +++++++++++
shotwell.spec | 6 +++++-
2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/shotwell.spec b/shotwell.spec
index 6d3f0a8..73ae1d6 100644
--- a/shotwell.spec
+++ b/shotwell.spec
@@ -2,12 +2,13 @@ Summary: Photo manager for GNOME
Summary(pl.UTF-8): Zarządca zdjęć dla GNOME
Name: shotwell
Version: 0.24.1
-Release: 1
+Release: 2
License: LGPL v2+ and CC-BY-SA
Group: X11/Applications
Source0: http://ftp.gnome.org/pub/GNOME/sources/shotwell/0.24/%{name}-%{version}.tar.xz
# Source0-md5: b53b86424564d2f94d56621b1a10a8a4
Patch0: %{name}-link.patch
+Patch1: %{name}-gitversion.patch
URL: https://wiki.gnome.org/Apps/Shotwell
BuildRequires: appstream-glib-devel
BuildRequires: atk-devel
@@ -69,6 +70,9 @@ pełnoekranowym oraz eksportować, aby podzielić się nimi z innymi.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+
+%{__rm} src/Resources.c
%build
%{__aclocal} -I m4
diff --git a/shotwell-gitversion.patch b/shotwell-gitversion.patch
new file mode 100644
index 0000000..955bbe4
--- /dev/null
+++ b/shotwell-gitversion.patch
@@ -0,0 +1,11 @@
+--- shotwell-0.24.1/configure.ac.gitversion 2016-10-24 22:07:04.513398042 +0200
++++ shotwell-0.24.1/configure.ac 2016-10-24 22:07:17.225848614 +0200
+@@ -13,7 +13,7 @@ m4_define([api_version],[major_version])
+
+ AX_IS_RELEASE([micro-version])
+
+-m4_define([git_version],[m4_esyscmd(git rev-parse HEAD)])
++m4_define([git_version],[])
+
+ dnl ***********************************************************************
+ dnl Initialize autoconf
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/shotwell.git/commitdiff/2cfd30788bb02cc1e9a90154ebe20a69515bddb3
More information about the pld-cvs-commit
mailing list