diff --git a/.gitignore b/.gitignore index ed65c14..4e363ba 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2 /gimp-2.7.3.tar.bz2 /gimp-2.7.4.tar.bz2 /gimp-2.7.5.tar.bz2 +/gimp-2.8.0-RC1.tar.bz2 diff --git a/gimp.spec b/gimp.spec index aa2ae89..268d369 100644 --- a/gimp.spec +++ b/gimp.spec @@ -38,14 +38,21 @@ %bcond_with poppler +# Set this to 0 in stable, 1 in (SONAME-wise) unstable releases +%global unstable 0 + +# Set this in pre-releases (e.g. release candidates) +%global prerel RC1 + Summary: GNU Image Manipulation Program Name: gimp Epoch: 2 -Version: 2.7.5 -Release: 2%{?dist} - -# Set this to 0 in stable, 1 in unstable releases -%global unstable 1 +Version: 2.8.0 +%if %{undefined prerel} +Release: 1%{?dist} +%else +Release: 0.1.%{prerel}%{?dist} +%endif # Compute some version related macros # Ugly hack, you need to get your quoting backslashes/percent signs straight @@ -75,20 +82,20 @@ BuildRequires: chrpath >= 0.13-5 BuildRequires: aalib-devel %endif BuildRequires: alsa-lib-devel >= 1.0.0 -BuildRequires: atk-devel >= 2.0.1 -BuildRequires: babl-devel >= 0.1.6 +BuildRequires: atk-devel >= 2.2.0 +BuildRequires: babl-devel >= 0.1.10 BuildRequires: bzip2-devel BuildRequires: cairo-devel >= 1.10.2 BuildRequires: curl-devel >= 7.15.1 BuildRequires: dbus-glib-devel >= 0.70 BuildRequires: fontconfig-devel >= 2.2.0 BuildRequires: freetype-devel >= 2.1.7 -BuildRequires: gdk-pixbuf2-devel >= 2.24.0 -BuildRequires: gegl-devel >= 0.1.8 +BuildRequires: gdk-pixbuf2-devel >= 2.24.1 +BuildRequires: gegl-devel >= 0.2.0 BuildRequires: ghostscript-devel BuildRequires: glib2-devel >= 2.30.2 BuildRequires: gnome-keyring-devel >= 0.4.5 -BuildRequires: gtk2-devel >= 2.24.7 +BuildRequires: gtk2-devel >= 2.24.10 BuildRequires: gtk-doc >= 1.0 BuildRequires: iso-codes-devel BuildRequires: jasper-devel @@ -133,6 +140,8 @@ BuildRequires: intltool BuildRequires: gettext BuildRequires: findutils +Requires: babl%{?_isa} >= 0.1.10 +Requires: gegl%{?_isa} >= 0.2.0 Requires: glib2 >= 2.28.8 Requires: gtk2 >= 2.24.7 Requires: pango >= 1.29.4 @@ -150,7 +159,7 @@ Requires: pygtk2 >= 2.10.4 Requires: xdg-utils Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2 +Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}%{?prerel:-%{prerel}}.tar.bz2 %description GIMP (GNU Image Manipulation Program) is a powerful image composition and @@ -227,7 +236,7 @@ use poppler: %{with poppler} --- >8 --------------------------------------------------------------------- EOF -%setup -q -n gimp-%{version} +%setup -q -n gimp-%{version}%{?prerel:-%{prerel}} %build %if %{with hardening} @@ -500,6 +509,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser %changelog +* Tue Apr 03 2012 Nils Philippsen - 2:2.8.0-0.1.RC1 +- version 2.8.0-RC1 (release candidate): + - Add our own GimpOperationBrightnessContrast because GEGL one is different + - Fix some GFig rendering issues + - Depend on Babl 0.1.10, GEGL 0.2.0 and some other new library versions + - Bug fixes + - Translation updates + * Tue Mar 13 2012 Nils Philippsen - 2:2.7.5-2 - add BR: iso-codes-devel diff --git a/sources b/sources index cdac9a6..398d860 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -55c3ce1402890665464d9aad74ea63b6 gimp-2.7.5.tar.bz2 +134396e4399b7e753ffca7ba366c418f gimp-2.8.0-RC1.tar.bz2