diff --git a/gimp.changes b/gimp.changes index 3fa2503..31b0424 100644 --- a/gimp.changes +++ b/gimp.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Jan 15 15:44:05 UTC 2017 - zaitor@opensuse.org + +- Replace -devel BuildRequires for their pkgconfig version aligned + with what configure looks for: + - babl-devel for pkgconfig(babl). + - gegl-devel for pkgconfig(gegl-0.2). + - libpng-devel for pkgconfig(libpng). + - libpoppler-glib-devel for pkgconfig(poppler-glib). + - xorg-x11-libXfixes-devel for pkgconfig(xfixes). + - xorg-x11-libXpm-devel for pkgconfig(xpm). + - zlib-devel for pkgconfig(zlib). +- Add an explicit pkgconfig(cairo-pdf) BuildRequires: configure + checks for it (full pdf support). +- Run spec-cleaner: drop obsolete clean, modernise macros. +- No longer depend on libwebkit-devel for Tumbleweed and pass + --disable-webkit to configure for Tumbleweed. + ------------------------------------------------------------------- Sun Jul 31 04:04:52 UTC 2016 - plinnell@opensuse.org diff --git a/gimp.spec b/gimp.spec index e1e9bab..35202ae 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,7 +1,7 @@ # # spec file for package gimp # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,10 +33,8 @@ Source2: openSUSE.gpl Source99: baselibs.conf BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 -BuildRequires: babl-devel >= 0.1.10 BuildRequires: fdupes BuildRequires: fontconfig-devel >= 2.2.0 -BuildRequires: gegl-devel >= 0.2.0 BuildRequires: ghostscript-devel # Explicitly needed, otherwise ghostscript-mini is used during the # build, and it's not enough for gimp. @@ -47,48 +45,47 @@ BuildRequires: libbz2-devel BuildRequires: libjasper-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel -BuildRequires: libpng-devel >= 1.2.37 -BuildRequires: libpoppler-glib-devel >= 0.12.4 -BuildRequires: pkgconfig(cairo) >= 1.10.2 -BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 -BuildRequires: pkgconfig(glib-2.0) >= 2.30.2 -BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 -BuildRequires: pkgconfig(lcms2) >= 2.2 -BuildRequires: pkgconfig(libexif) >= 0.6.15 -%if 0%{?suse_version} < 1220 -# best-effort attempt to use librsvg (file-svg plugin will be built -# if recent-enough version of librsvg is there) -BuildRequires: librsvg-devel -%else -BuildRequires: librsvg-devel >= 2.36.0 -%endif BuildRequires: libtiff-devel +%if 0%{?suse_version} < 1330 BuildRequires: libwebkit-devel >= 1.6.1 -BuildRequires: libwmf-devel >= 0.2.8 -%if 0%{?suse_version} < 1220 -BuildRequires: libxslt-devel -%else -BuildRequires: libxslt-tools %endif +BuildRequires: libwmf-devel >= 0.2.8 +BuildRequires: pkgconfig BuildRequires: python-gtk-devel >= 2.10.4 BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: xorg-x11-libXfixes-devel -BuildRequires: xorg-x11-libXpm-devel -BuildRequires: zlib-devel BuildRequires: pkgconfig(atk) >= 2.2.0 +BuildRequires: pkgconfig(babl) >= 0.1.10 +BuildRequires: pkgconfig(cairo) >= 1.10.2 +BuildRequires: pkgconfig(cairo-pdf) >= 1.10.2 +BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.1 +BuildRequires: pkgconfig(gegl-0.2) >= 0.2.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.30.2 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.10 BuildRequires: pkgconfig(gudev-1.0) >= 167 +BuildRequires: pkgconfig(lcms2) >= 2.2 +BuildRequires: pkgconfig(libexif) >= 0.6.15 +BuildRequires: pkgconfig(libpng) >= 1.2.37 BuildRequires: pkgconfig(pango) >= 1.29.4 +BuildRequires: pkgconfig(poppler-glib) >= 0.12.4 BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zlib) +# Explicitly declare the libgimp versions for upgrade purposes +Requires: libgimp-2_0-0 = %{version} +Requires: libgimpui-2_0-0 = %{version} +%if 0%{?suse_version} < 1330 Recommends: %{name}-help-browser +%endif Recommends: %{name}-lang Recommends: %{name}-plugins-python = %{version} Recommends: iso-codes -# With openSUSE 13.1, we started shipping gimp unbranded -Obsoletes: %{name}-branding Suggests: AdobeICCProfiles Suggests: gimp-2.0-scanner-plugin +# With openSUSE 13.1, we started shipping gimp unbranded +Obsoletes: %{name}-branding Provides: gimp-2.0 = %{version} Provides: gimp(abi) = %{abiver} Provides: gimp(api) = %{apiver} @@ -96,9 +93,18 @@ Obsoletes: gimp-unstable < 2.6.0 # Obsolete hal subpackage which we had until 11.4. Obsoletes: %{name}-module-hal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -# Explicitly declare the libgimp versions for upgrade purposes -Requires: libgimp-2_0-0 = %{version} -Requires: libgimpui-2_0-0 = %{version} +%if 0%{?suse_version} < 1220 +# best-effort attempt to use librsvg (file-svg plugin will be built +# if recent-enough version of librsvg is there) +BuildRequires: librsvg-devel +%else +BuildRequires: librsvg-devel >= 2.36.0 +%endif +%if 0%{?suse_version} < 1220 +BuildRequires: libxslt-devel +%else +BuildRequires: libxslt-tools +%endif %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -193,7 +199,7 @@ distribute. %package devel Summary: The GNU Image Manipulation Program -Group: Development/Libraries +Group: Development/Libraries/Other Requires: libgimp-2_0-0 = %{version} Requires: libgimpui-2_0-0 = %{version} Provides: gimp-2.0-devel = %{version} @@ -213,6 +219,7 @@ conversions- all including multilevel undo. The GIMP offers a scripting facility, but many of the included scripts rely on fonts that we cannot distribute. +%if 0%{?suse_version} < 1330 %package help-browser Summary: The GNU Image Manipulation Program - Help Browser Group: Productivity/Graphics/Bitmap Editors @@ -221,8 +228,10 @@ Supplements: packageand(%{name}:gimp-help) %description help-browser This package contains the help browser for the GIMP. This package is optional. +%endif %lang_package + %prep %setup -q translation-update-upstream @@ -250,9 +259,13 @@ fi export CFLAGS="%{optflags} -fno-strict-aliasing" %configure --with-pic\ --disable-static\ +%if 0%{?suse_version} >= 1330 + --without-webkit\ +%endif --libexecdir=%{_prefix}/lib\ --enable-default-binary\ --enable-mp + make %{?_smp_mflags} %install @@ -275,7 +288,7 @@ for PLUGIN in %{buildroot}%{_libdir}/gimp/2.0/plug-ins/* ; do echo "${PLUGIN#%{buildroot}}" >>plugins.list fi done -rm %{buildroot}%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print # Install the macros file: install -d %{buildroot}%{_sysconfdir}/rpm sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \ @@ -287,34 +300,28 @@ install -m 644 -c macros.gimp \ %fdupes %{buildroot}%{_datadir}/gimp/2.0/ %if 0%{?suse_version} > 1130 - %post %desktop_database_post %icon_theme_cache_post %endif %if 0%{?suse_version} > 1130 - %postun %desktop_database_postun %icon_theme_cache_postun %endif %post -n libgimp-2_0-0 -p /sbin/ldconfig - %postun -n libgimp-2_0-0 -p /sbin/ldconfig - %post -n libgimpui-2_0-0 -p /sbin/ldconfig - %postun -n libgimpui-2_0-0 -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -f plugins.list %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog LICENSE NEWS* README +%if 0%{?suse_version} < 1330 %exclude %{_libdir}/gimp/2.0/plug-ins/help-browser +%endif %{_bindir}/gimp %{_bindir}/gimp-2.? %{_bindir}/gimp-console @@ -377,10 +384,12 @@ rm -rf %{buildroot} %{_libdir}/libgimpui-2.0.so.* %{_libdir}/libgimpwidgets-2.0.so.* +%if 0%{?suse_version} < 1330 %files help-browser %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog LICENSE NEWS* README %{_libdir}/gimp/2.0/plug-ins/help-browser +%endif %files plugins-python -f plugins-python.list %defattr(-,root,root) @@ -390,6 +399,7 @@ rm -rf %{buildroot} # FIXME: Maybe split gimp-lang and gimp-plugins-python-lang %files lang -f gimp20.lang +%defattr(-,root,root) %files devel %defattr(-,root,root)