From 5e163ccb3d0715b4900a2a436536db6673201c94ca8d5e3712174a8d129b2b19 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 17 Jun 2011 08:02:47 +0000 Subject: [PATCH] Accepting request 73801 from GNOME:Apps Fix build (forwarded request 73763 from vuntz) OBS-URL: https://build.opensuse.org/request/show/73801 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=60 --- gimp.changes | 8 ++++++++ gimp.spec | 2 ++ 2 files changed, 10 insertions(+) diff --git a/gimp.changes b/gimp.changes index c6d6ae5..6fcc5ba 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 15 16:19:39 CEST 2011 - vuntz@opensuse.org + +- Fix build on Factory, by not excluding the + libcontroller-linux-input.so module from the file list of the + main package when we build without hal. It was only excluded to + be part of a hal subpackage when there is the hal dependency. + ------------------------------------------------------------------- Sun Jun 12 00:14:35 CEST 2011 - vuntz@opensuse.org diff --git a/gimp.spec b/gimp.spec index e4f8a06..5f55877 100644 --- a/gimp.spec +++ b/gimp.spec @@ -348,7 +348,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gimp/2.0/environ/default.env %{_libdir}/gimp/2.0/interpreters/default.interp %{_libdir}/gimp/2.0/modules/*.so +%if %{build_hal} %exclude %{_libdir}/gimp/2.0/modules/libcontroller-linux-input.so +%endif %doc %{_mandir}/man?/gimp.* %doc %{_mandir}/man?/gimp-2.?.* %doc %{_mandir}/man?/gimp-console.*