Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package eog for openSUSE:Factory
checked in at Thu Sep 15 12:05:07 CEST 2011.



--------
--- GNOME/eog/eog.changes       2011-09-06 22:07:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/eog/eog.changes        2011-09-14 
22:51:47.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Sep 14 20:41:29 UTC 2011 - vuntz@xxxxxxxxxxxx
+
+- Add eog-fix-doc-figures.patch: fix installation of doc figures so
+  we don't install non-existing figures, that would result in
+  broken links -- those will break the build of bundle-lang-gnome.
+- Add gnome-common BuildRequires and call to autoreconf, needed for
+  the patch above.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  eog-fix-doc-figures.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ eog.spec ++++++
--- /var/tmp/diff_new_pack.w5tz26/_old  2011-09-15 12:05:02.000000000 +0200
+++ /var/tmp/diff_new_pack.w5tz26/_new  2011-09-15 12:05:02.000000000 +0200
@@ -19,14 +19,18 @@
 
 Name:           eog
 Version:        3.1.91
-Release:        1
+Release:        2
 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once 
fixed exempi is in
 License:        GPLv2+ ; LGPLv2.1+
 Summary:        Image Viewer for GNOME
 Url:            http://www.gnome.org/
 Group:          Productivity/Graphics/Viewers
 Source:         
http://download.gnome.org/sources/eog/3.1/%{name}-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM eog-fix-doc-figures.patch bgo#659093 vuntz@xxxxxxxxxxxx 
-- Fix build system to not install non-existing figures
+Patch0:         eog-fix-doc-figures.patch
 BuildRequires:  fdupes
+# needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  libexempi-devel
@@ -69,8 +73,11 @@
 %prep
 %setup -q
 translation-update-upstream
+%patch0 -p1
 
 %build
+# needed for patch0
+autoreconf -fi
 %configure\
        --disable-scrollkeeper
 make %{?jobs:-j%jobs}

++++++ eog-fix-doc-figures.patch ++++++
commit d7526fe85b71b7de82d7c7a5404abbd7251c2a27
Author: Vincent Untz <vuntz@xxxxxxxxx>
Date:   Wed Sep 14 22:37:57 2011 +0200

    build: Update list of doc figures
    
    https://bugzilla.gnome.org/show_bug.cgi?id=659093

diff --git a/help/Makefile.am b/help/Makefile.am
index 9221352..b52905e 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -5,12 +5,6 @@ DOC_ID = eog
 DOC_INCLUDES = legal.xml
 
 DOC_FIGURES = \
-       figures/eog-bestfit.png                 \
-       figures/eog-enlarge.png                 \
-       figures/eog-normalsize.png              \
-       figures/eog.png                         \
-       figures/eog-shrink.png                  \
-       figures/eog-toolbar-default.png         \
        figures/eog-toolbar-editor.png          \
        figures/image-view-prefs.png            \
        figures/multiple-convert.png            \

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx