From b8b46689cd97b90e13ef60d36e67e5a76c2f92f3f29cdc17a5a9df54cce8ea9b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 13 Jul 2013 15:40:48 +0000 Subject: [PATCH] Accepting request 182980 from home:dimstar:branches:GNOME:Factory I missed this SR... needed for eog-plugins OBS-URL: https://build.opensuse.org/request/show/182980 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/eog?expand=0&rev=155 --- eog.changes | 8 ++++++++ eog.spec | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/eog.changes b/eog.changes index 6c81dbc..8af539c 100644 --- a/eog.changes +++ b/eog.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 12 09:37:00 UTC 2013 - dimstar@opensuse.org + +- Manually install eog-uri-converter.h: the header is wrongly + marked as NOINST, but is referenced by eog-uri-jobs.h. + The install command will fail when the file is installed by make + install. + ------------------------------------------------------------------- Fri Jun 21 18:31:17 UTC 2013 - dimstar@opensuse.org diff --git a/eog.spec b/eog.spec index 8dea6e5..3b8a99e 100644 --- a/eog.spec +++ b/eog.spec @@ -75,9 +75,10 @@ make %{?_smp_mflags} %install %makeinstall -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/* -%endif +# install eog-uri-converter.h manually, so we do not have to bootstrap the source, bgo#704074 +test ! -f %{buildroot}%{_includedir}/eog-3.0/eog/eog-uri-converter.h + install src/eog-uri-converter.h %{buildroot}%{_includedir}/eog-3.0/eog/eog-uri-converter.h +# end fix for bgo#704074, will fail when fixed upstream %suse_update_desktop_file %{name} %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot}