Hello community,

here is the log from the commit of package gimp for openSUSE:Factory
checked in at Tue Jun 14 12:03:33 CEST 2011.



--------
--- GNOME/gimp/gimp.changes     2011-02-15 10:17:26.000000000 +0100
+++ /mounts/work_src_done/STABLE/gimp/gimp.changes      2011-06-12 
00:15:23.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Jun 12 00:14:35 CEST 2011 - [email protected]
+
+- On 12.1 and later, stop building the gimp-module-hal subpackage:
+  + we don't want hal anymore on 12.1 and later (see bnc#697016).
+    We use a build_hal define to control that behavior.
+  + remove hal-devel BuildRequires
+  + do not build a gimp-module-hal subpackage anymore
+  + add gimp-module-hal Obsoletes for smooth upgrades
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


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

Other differences:
------------------
++++++ gimp.spec ++++++
--- /var/tmp/diff_new_pack.0Vil3t/_old  2011-06-14 12:02:06.000000000 +0200
+++ /var/tmp/diff_new_pack.0Vil3t/_new  2011-06-14 12:02:06.000000000 +0200
@@ -15,7 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+
+%define build_hal 0%{?suse_version} <= 1140
 
 %global abiver 4
 %global apiver 2.0
@@ -30,7 +31,9 @@
 BuildRequires:  gegl-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+%if %{build_hal}
 BuildRequires:  hal-devel
+%endif
 BuildRequires:  intltool
 BuildRequires:  iso-codes-devel
 BuildRequires:  libexif-devel
@@ -49,7 +52,7 @@
 BuildRequires:  xorg-x11-libXfixes-devel
 Url:            http://www.gimp.org/
 Version:        2.6.11
-Release:        6
+Release:        15
 License:        GPLv2+
 Group:          Productivity/Graphics/Bitmap Editors
 Suggests:       AdobeICCProfiles
@@ -71,6 +74,10 @@
 Requires:       %{name}-branding >= 2.4
 Recommends:     %{name}-plugins-python = %{version} gimp-2.0-scanner-plugin 
%{name}-help-browser
 Provides:       gimp(api) = %{apiver} gimp(abi) = %{abiver}
+%if ! %{build_hal}
+# Obsolete hal subpackage which we had until 11.4.
+Obsoletes:      %{name}-module-hal <= %{version}
+%endif
 
 %description
 The GIMP (GNU Image Manipulation Program) is a powerful image
@@ -78,7 +85,7 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
@@ -96,7 +103,7 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
@@ -116,7 +123,7 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
@@ -145,7 +152,7 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
@@ -170,7 +177,7 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
@@ -194,7 +201,7 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
@@ -212,6 +219,8 @@
 This package contains the help browser for the GIMP.
 
 
+%if %{build_hal}
+
 %package module-hal
 License:        GPLv2+
 Summary:        The GNU Image Manipulation Program - module to detect input 
devices with HAL
@@ -225,15 +234,17 @@
 creating logos and other graphics for Web pages.  The GIMP offers many
 of the tools and filters you would expect to find in similar commercial
 offerings and contains some interesting extras as well. The GIMP
-provides alarge image manipulation toolbox, including channel
+provides a large image manipulation toolbox, including channel
 operations and layers, effects, subpixel imaging and antialiasing, and
 conversions- all including multilevel undo. The GIMP offers a scripting
 facility, but many of the included scripts rely on fonts that we cannot
 distribute.
 
 This package provides a module to detect input devices with HAL.
+%endif
 
 %lang_package
+
 %prep
 %setup -q
 translation-update-upstream
@@ -387,9 +398,12 @@
 %{_libdir}/gimp/2.0/python/
 # FIXME: Maybe split gimp-lang and gimp-plugins-python-lang
 
+%if %{build_hal}
+
 %files module-hal
 %defattr(-,root,root)
 %{_libdir}/gimp/2.0/modules/libcontroller-linux-input.so
+%endif
 
 %files lang -f gimp20.lang
 


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



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to