[gimp: 1/5] version 2.7.3
Nils Philippsen
nphilipp at fedoraproject.org
Thu Dec 15 14:45:30 UTC 2011
commit 120b9263d81d90e023522589545599f22fc4af33
Author: Nils Philippsen <nils at redhat.com>
Date: Tue Aug 30 16:58:54 2011 +0200
version 2.7.3
- version 2.7.3 (unstable, see http://developer.gimp.org/NEWS for
details)
- change license to GPLv3+/LGPLv3+
- update required versions of dependencies
- build with cairo-pdf, jasper, require jasper-devel for building
- build without poppler as that currently is GPLv2 only, thus
incompatible with LGPLv3 gimp libraries (use postscript plugin for
PDF import meanwhile), future poppler versions will be "GPLv2 or
GPLv3", i.e. compatible again
- clean up configure options, compiler/linker flags
- suppress abrt bug reporting for unstable releases
- remove all patches (obsolete, woo!)
- add new files, remove files that are not installed any longer
- use %%global instead of %%define
- replace hal, minorver, microver, interfacever, gimp_lang_ver macros
with gudev, lib_minor, lib_micro, lib_api_version, gettext_version
macros
- compute more version macros (ugly, but convenient)
- use gudev from Fedora 15 on
- use convenience macro for hardening binaries from F-16 on
.gitignore | 1 +
gimp-2.6.10-script-fu-ipv6.patch | 279 -------------
gimp-2.6.11-CVE-2010-4540,4541,4542.patch | 143 -------
gimp-2.6.11-colorxhtml.patch | 43 --
gimp-2.6.11-gif-load.patch | 108 -----
gimp-2.6.11-poppler-0.17.patch | 477 ----------------------
gimp-2.6.11-psp-overflow.patch | 45 ---
gimp-2.6.11-pyslice.patch | 36 --
gimp-2.6.11-shell-dnd-quit-crash.patch | 83 ----
gimp-2.6.11-startup-warning.patch | 38 --
gimp-2.6.2-xdg-open.patch | 36 --
gimp-2.6.6-minimize-dialogs.patch | 349 ----------------
gimp-2.6.7-jpeg-units.patch | 45 ---
gimp-2.6.8-gold.patch | 616 -----------------------------
gimp.spec | 423 +++++++++++---------
sources | 3 +-
16 files changed, 236 insertions(+), 2489 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2390869..e904f9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gimp-2.6.10-1-autoreconf.patch.bz2
/gimp-2.6.11-1-autoreconf.patch.bz2
/gimp-2.6.11-10-autoreconf.patch.bz2
/gimp-2.6.11-11-autoreconf.patch.bz2
+/gimp-2.7.3.tar.bz2
diff --git a/gimp.spec b/gimp.spec
index 9f569e5..471f419 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -17,33 +17,54 @@
%bcond_without gutenprint
# convenience: install convenience symlinks
%bcond_without convenience
-# hal: use HAL to discover special input devices
-%if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
-# don't use HAL from F-16/RHEL7 on
-%bcond_with hal
+# gudev: use gudev to discover special input devices
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 15 || 0%{?rhel} >= 7
+# use gudev from F-15/RHEL7 on
+%bcond_without gudev
%else
-%bcond_without hal
+%bcond_with gudev
%endif
# aalib: build with AAlib (ASCII art gfx library)
-%if 0%{?rhel} != 0
+%if 0%{?rhel}
# don't use aalib on RHEL
%bcond_with aalib
%else
%bcond_without aalib
%endif
+# hardening: use various compiler/linker flags to harden binaries against
+# certain types of exploits
+%bcond_without hardening
+# Reset this once poppler picks up the updated xpdf version of "GPLv2 or GPLv3"
+%bcond_with poppler
+
Summary: GNU Image Manipulation Program
Name: gimp
Epoch: 2
-Version: 2.6.11
-Release: 21%{?dist}
-%define binver 2.6
-%define gimp_lang_ver 20
-%define interfacever 2.0
-%define age 0
-%define minorver 600
-%define microver %(ver=%{version}; echo ${ver##*.*.})
-License: GPLv2+
+Version: 2.7.3
+Release: 1%{?dist}
+
+# Set this to 0 in stable, 1 in unstable releases
+%global unstable 1
+
+# Compute some version related macros
+# Ugly hack, you need to get your quoting backslashes/percent signs straight
+%global major %(ver=%version; echo ${ver%%%%.*})
+%global minor %(ver=%version; ver=${ver#%major.}; echo ${ver%%%%.*})
+%global micro %(ver=%version; ver=${ver#%major.%minor.}; echo ${ver%%%%.*})
+%global binver %major.%minor
+%global interface_age 0
+%global gettext_version 20
+%global lib_api_version 2.0
+%if ! %unstable
+%global lib_minor %(echo $[%minor * 100])
+%global lib_micro %micro
+%else # unstable
+%global lib_minor %(echo $[%minor * 100 + %micro])
+%global lib_micro 0
+%endif # unstable
+
+License: GPLv3+
Group: Applications/Multimedia
URL: http://www.gimp.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
@@ -54,34 +75,40 @@ BuildRequires: chrpath >= 0.13-5
BuildRequires: aalib-devel
%endif
BuildRequires: alsa-lib-devel >= 1.0.0
-BuildRequires: babl-devel >= 0.0.22
-BuildRequires: cairo-devel >= 1.4.10
+BuildRequires: babl-devel >= 0.1.4
+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: gegl-devel >= 0.0.18
-BuildRequires: glib2-devel >= 2.16.1
+BuildRequires: gdk-pixbuf2-devel >= 2.22.1
+BuildRequires: gegl-devel >= 0.1.6
+BuildRequires: glib2-devel >= 2.28.1
BuildRequires: gnome-keyring-devel >= 0.4.5
-BuildRequires: gtk2-devel >= 2.12.5
+BuildRequires: gtk2-devel >= 2.24.3
BuildRequires: gtk-doc >= 1.0
-%if %{with hal}
-BuildRequires: hal-devel >= 0.5.7
-%endif
+BuildRequires: jasper-devel
BuildRequires: libexif-devel >= 0.6.15
BuildRequires: libgnomeui-devel >= 2.10.0
+%if %{with gudev}
+BuildRequires: libgudev1-devel >= 167
+%else
+BuildRequires: hal-devel >= 0.5.7
+%endif
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.2.37
BuildRequires: librsvg2-devel >= 2.14.0
BuildRequires: libtiff-devel
BuildRequires: libwmf-devel >= 0.2.8
-BuildRequires: pango-devel >= 1.18.0
+BuildRequires: pango-devel >= 1.22.0
+%if %{with poppler}
%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
BuildRequires: poppler-glib-devel >= 0.4.1
%else
BuildRequires: poppler-devel >= 0.4.1
%endif
+%endif
BuildRequires: python-devel
BuildRequires: pygtk2-devel >= 2.10.4
BuildRequires: pygobject2-devel
@@ -101,9 +128,9 @@ BuildRequires: findutils
BuildRequires: lcms-devel >= 1.16
%endif
-Requires: glib2 >= 2.16.1
-Requires: gtk2 >= 2.12.5
-Requires: pango >= 1.18.0
+Requires: glib2 >= 2.28.1
+Requires: gtk2 >= 2.24.3
+Requires: pango >= 1.22.0
Requires: freetype >= 2.1.7
Requires: fontconfig >= 2.2.0
%if ! %{with print}
@@ -119,44 +146,6 @@ Requires: xdg-utils
Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
-# distro specific: use xdg-open instead of firefox as web browser
-Patch0: gimp-2.6.2-xdg-open.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=559081
-# "JPEG Save dialog preview should adjust size units"
-Patch1: gimp-2.6.7-jpeg-units.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=556896
-# "Dialogs don't get minimized with single image window"
-Patch2: gimp-2.6.6-minimize-dialogs.patch
-# backport: fix building with "gold" linker
-Patch3: gimp-2.6.8-gold.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=198367
-# https://bugzilla.gnome.org/show_bug.cgi?id=623045
-# make script-fu logging IPv6 aware
-Patch4: gimp-2.6.10-script-fu-ipv6.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=651002
-# avoid traceback in colorxhtml plugin, upstreamed
-Patch5: gimp-2.6.11-colorxhtml.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=667958
-# avoid traceback in pyslice plugin, upstreamed
-Patch6: gimp-2.6.11-pyslice.patch
-# backport: work with poppler-0.17, upstreamed
-Patch7: gimp-2.6.11-poppler-0.17.patch
-# backport: CVE-2010-4543, CVE-2011-1782
-# harden PSP plugin against bogus input data
-Patch8: gimp-2.6.11-psp-overflow.patch
-# backport: CVE-2010-4540, CVE-2010-4541, CVE-2010-4542
-# fix buffer overflows in sphere-designer, gfig, lighting plugins
-Patch9: gimp-2.6.11-CVE-2010-4540,4541,4542.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=711952
-# https://bugzilla.gnome.org/show_bug.cgi?id=652280
-# guard against crash due to quitting while DND is processed, upstreamed
-Patch10: gimp-2.6.11-shell-dnd-quit-crash.patch
-# backport: fix goption warning on startup
-Patch11: gimp-2.6.11-startup-warning.patch
-# CVE-2011-2896: fix heap corruption and buffer overflow, upstreamed
-Patch12: gimp-2.6.11-gif-load.patch
-# files changed by autoreconf after applying the above
-Patch100: gimp-2.6.11-11-autoreconf.patch.bz2
%description
GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -166,20 +155,32 @@ to find in similar commercial offerings, and some interesting extras as well.
GIMP provides a large image manipulation toolbox, including channel operations
and layers, effects, sub-pixel imaging and anti-aliasing, and conversions, all
with multi-level undo.
+%if %unstable
+This is an UNSTABLE development version of GIMP. Please report bugs in the
+program upstream:
+
+https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP&version=%version
+%endif
%package libs
Summary: GIMP libraries
Group: System Environment/Libraries
-License: LGPLv2+
+License: LGPLv3+
%description libs
The gimp-libs package contains shared libraries needed for the GNU Image
Manipulation Program (GIMP).
+%if %unstable
+This is an UNSTABLE development version of GIMP. Please report bugs in the
+program upstream:
+
+https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP&version=%version
+%endif
%package devel
Summary: GIMP plugin and extension development kit
Group: Development/Libraries
-License: LGPLv2+
+License: LGPLv3+
Requires: gimp-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: gtk2-devel
@@ -190,75 +191,83 @@ Requires: pkgconfig
The gimp-devel package contains the static libraries and header files
for writing GNU Image Manipulation Program (GIMP) plug-ins and
extensions.
+%if %unstable
+This is an UNSTABLE development version of GIMP. Please report bugs in the
+program upstream:
+
+https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP&version=%version
+%endif
%package devel-tools
Summary: GIMP plugin and extension development tools
Group: Development/Tools
-License: LGPLv2+
+License: LGPLv3+
Requires: gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel-tools
The gimp-devel-tools package contains gimptool, a helper program to build GNU
Image Manipulation Program (GIMP) plug-ins and extensions.
+%if %unstable
+This is an UNSTABLE development version of GIMP. Please report bugs in the
+program upstream:
+
+https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP&version=%version
+%endif
%package help-browser
Summary: GIMP help browser plug-in
Group: Applications/Multimedia
-License: GPLv2+
+License: GPLv3+
Obsoletes: gimp < 2:2.6.0-3
Requires: gimp%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description help-browser
The gimp-help-browser package contains a lightweight help browser plugin for
viewing GIMP online help.
+%if %unstable
+This is an UNSTABLE development version of GIMP. Please report bugs in the
+program upstream:
+
+https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP&version=%version
+%endif
%prep
cat << EOF
-
-Build options:
-LCMS support: %{with lcms}
-Python support: %{with python}
-MP support: %{with mp}
-build static libs: %{with static}
-build internal print plugin: %{with print}
-include convenience symlinks: %{with convenience}
-build the print plugin: %{with print}
-use HAL: %{with hal}
+--- 8< --- Build options ---------------------------------------------------
+LCMS support: %{with lcms}
+Python support: %{with python}
+MP support: %{with mp}
+build static libs: %{with static}
+build internal print plugin: %{with print}
+include convenience symlinks: %{with convenience}
+build the print plugin: %{with print}
+use gudev: %{with gudev}
%if ! %{with print}
prefer gutenprint over (external) gimp-print plugin:
- %{with gutenprint}
+ %{with gutenprint}
%endif
-build ASCII art plugin %{with aalib}
-
-
+build ASCII art plugin %{with aalib}
+harden binaries: %{with hardening}
+use poppler: %{with poppler}
+--- >8 ---------------------------------------------------------------------
EOF
%setup -q -n gimp-%{version}
-%patch0 -p1 -b .xdg-open
-%patch1 -p1 -b .jpeg-units
-%patch2 -p1 -b .minimize-dialogs
-%patch3 -p1 -b .gold
-%patch4 -p1 -b .script-fu-ipv6
-%patch5 -p1 -b .colorxhtml
-%patch6 -p1 -b .pyslice
-%patch7 -p1 -b .poppler-0.17
-%patch8 -p1 -b .psp-overflow
-%patch9 -p1 -b .CVE-2010-4540,4541,4542
-%patch10 -p1 -b .shell-dnd-quit-crash
-%patch11 -p1 -b .startup-warning
-%patch12 -p1 -b .gif-load
-
-%patch100 -p1 -b .autoreconf
-
%build
-# Use PIC/PIE because gimp is likely to deal with files coming from untrusted
-# sources
-CFLAGS='-fPIC %optflags -fno-strict-aliasing'
-CXXFLAGS='-fPIC %optflags -fno-strict-aliasing'
-LDFLAGS='-pie'
+%if %{with hardening}
+# Use hardening compiler/linker flags because gimp is likely to deal with files
+# coming from untrusted sources
+%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 16 || 0%{?rhel} >= 7
+%global _hardened_build 1
+%else
+# fake things
+export CFLAGS='-fPIC %optflags'
+export CXXFLAGS='-fPIC %optflags'
+export LDFLAGS='-pie'
+%endif
+%endif
%configure \
- --enable-gimp-remote \
%if %{with python}
--enable-python \
%else
@@ -290,17 +299,22 @@ LDFLAGS='-pie'
%else
--without-aa \
%endif
-%if %{with hal}
- --with-hal \
+%if %{with gudev}
+ --with-gudev --without-hal \
%else
- --without-hal \
+ --with-hal --without-gudev \
%endif
%ifos linux
--with-linux-input \
%endif
- --with-libtiff --with-libjpeg --with-libpng --with-libmng --with-libexif \
- --with-librsvg --with-libxpm --with-poppler --with-gvfs --with-alsa \
- --with-webkit --with-dbus --with-script-fu
+%if use_poppler
+ --with-poppler \
+%else
+ --without-poppler \
+%endif
+ --with-libtiff --with-libjpeg --with-libpng --with-libmng --with-libjasper \
+ --with-libexif --with-librsvg --with-libxpm --with-gvfs --with-alsa \
+ --with-webkit --with-dbus --with-script-fu --with-cairo-pdf
make %{?_smp_mflags}
@@ -322,7 +336,7 @@ find %buildroot -name \*.la -exec %__rm -f {} \;
# Plugins and modules change often (grab the executeable ones)
#
echo "%defattr (-, root, root)" > gimp-plugin-files
-find %{buildroot}%{_libdir}/gimp/%{interfacever} -type f | sed "s@^%{buildroot}@@g" | grep -v '\.a$' >> gimp-plugin-files
+find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep -v '\.a$' >> gimp-plugin-files
# .pyc and .pyo files don't exist yet
grep "\.py$" gimp-plugin-files > gimp-plugin-files-py
@@ -334,20 +348,20 @@ done >> gimp-plugin-files
%if %{with static}
echo "%defattr (-, root, root)" > gimp-static-files
-find %{buildroot}%{_libdir}/gimp/%{interfacever} -type f | sed "s@^%{buildroot}@@g" | grep '\.a$' >> gimp-static-files
+find %{buildroot}%{_libdir}/gimp/%{lib_api_version} -type f | sed "s@^%{buildroot}@@g" | grep '\.a$' >> gimp-static-files
%endif
#
# Auto detect the lang files.
#
-%find_lang gimp%{gimp_lang_ver}
-%find_lang gimp%{gimp_lang_ver}-std-plug-ins
-%find_lang gimp%{gimp_lang_ver}-script-fu
-%find_lang gimp%{gimp_lang_ver}-libgimp
-%find_lang gimp%{gimp_lang_ver}-tips
-%find_lang gimp%{gimp_lang_ver}-python
+%find_lang gimp%{gettext_version}
+%find_lang gimp%{gettext_version}-std-plug-ins
+%find_lang gimp%{gettext_version}-script-fu
+%find_lang gimp%{gettext_version}-libgimp
+%find_lang gimp%{gettext_version}-tips
+%find_lang gimp%{gettext_version}-python
-cat gimp%{gimp_lang_ver}.lang gimp%{gimp_lang_ver}-std-plug-ins.lang gimp%{gimp_lang_ver}-script-fu.lang gimp%{gimp_lang_ver}-libgimp.lang gimp%{gimp_lang_ver}-tips.lang gimp%{gimp_lang_ver}-python.lang > gimp-all.lang
+cat gimp%{gettext_version}.lang gimp%{gettext_version}-std-plug-ins.lang gimp%{gettext_version}-script-fu.lang gimp%{gettext_version}-libgimp.lang gimp%{gettext_version}-tips.lang gimp%{gettext_version}-python.lang > gimp-all.lang
#
# Build the master filelists generated from the above mess.
@@ -360,13 +374,21 @@ ln -snf gimp-%{binver} %{buildroot}%{_bindir}/gimp
ln -snf gimp-%{binver}.1 %{buildroot}%{_mandir}/man1/gimp.1
ln -snf gimp-console-%{binver} %{buildroot}/%{_bindir}/gimp-console
ln -snf gimp-console-%{binver}.1 %{buildroot}/%{_mandir}/man1/gimp-console.1
-ln -snf gimp-remote-%{binver} %{buildroot}%{_bindir}/gimp-remote
-ln -snf gimp-remote-%{binver}.1 %{buildroot}%{_mandir}/man1/gimp-remote.1
-ln -snf gimptool-%{interfacever} %{buildroot}%{_bindir}/gimptool
-ln -snf gimptool-%{interfacever}.1 %{buildroot}%{_mandir}/man1/gimptool.1
+ln -snf gimptool-%{lib_api_version} %{buildroot}%{_bindir}/gimptool
+ln -snf gimptool-%{lib_api_version}.1 %{buildroot}%{_mandir}/man1/gimptool.1
ln -snf gimprc-%{binver}.5 %{buildroot}/%{_mandir}/man5/gimprc.5
%endif
+%if %unstable
+# Suppress abrt bug reporting for unstable releases
+mkdir -p %{buildroot}%{_sysconfdir}/libreport/events.d
+cat << EOF > %{buildroot}%{_sysconfdir}/libreport/events.d/gimp-unstable.conf
+# don't generate abrt reports for unstable gimp releases
+EVENT=post-create executable~=.*/gimp.*
+ test -d "\$DUMP_DIR" && rm -rf -- "\$DUMP_DIR"
+EOF
+%endif # unstable
+
%clean
rm -rf %{buildroot}
@@ -394,90 +416,93 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/applications/*.desktop
%dir %{_datadir}/gimp
-%dir %{_datadir}/gimp/%{interfacever}
-%{_datadir}/gimp/%{interfacever}/tips/
-%{_datadir}/gimp/%{interfacever}/menus/
+%dir %{_datadir}/gimp/%{lib_api_version}
+%{_datadir}/gimp/%{lib_api_version}/dynamics/
+%{_datadir}/gimp/%{lib_api_version}/menus/
+%{_datadir}/gimp/%{lib_api_version}/tags/
+%{_datadir}/gimp/%{lib_api_version}/tips/
+%{_datadir}/gimp/%{lib_api_version}/ui/
%dir %{_libdir}/gimp
-%dir %{_libdir}/gimp/%{interfacever}
-%dir %{_libdir}/gimp/%{interfacever}/environ
-#%dir %{_libdir}/gimp/%{interfacever}/fonts
-%dir %{_libdir}/gimp/%{interfacever}/interpreters
-%dir %{_libdir}/gimp/%{interfacever}/modules
-%dir %{_libdir}/gimp/%{interfacever}/plug-ins
-%exclude %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
-%dir %{_libdir}/gimp/%{interfacever}/python
-#%dir %{_libdir}/gimp/%{interfacever}/tool-plug-ins
-
-%{_datadir}/gimp/%{interfacever}/brushes/
-%{_datadir}/gimp/%{interfacever}/fractalexplorer/
-%{_datadir}/gimp/%{interfacever}/gfig/
-%{_datadir}/gimp/%{interfacever}/gflare/
-%{_datadir}/gimp/%{interfacever}/gimpressionist/
-%{_datadir}/gimp/%{interfacever}/gradients/
-# %{_datadir}/gimp/%{interfacever}/help/
-%{_datadir}/gimp/%{interfacever}/images/
-%{_datadir}/gimp/%{interfacever}/palettes/
-%{_datadir}/gimp/%{interfacever}/patterns/
-%{_datadir}/gimp/%{interfacever}/scripts/
-%{_datadir}/gimp/%{interfacever}/themes/
+%dir %{_libdir}/gimp/%{lib_api_version}
+%dir %{_libdir}/gimp/%{lib_api_version}/environ
+#%dir %{_libdir}/gimp/%{lib_api_version}/fonts
+%dir %{_libdir}/gimp/%{lib_api_version}/interpreters
+%dir %{_libdir}/gimp/%{lib_api_version}/modules
+%dir %{_libdir}/gimp/%{lib_api_version}/plug-ins
+%exclude %{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
+%dir %{_libdir}/gimp/%{lib_api_version}/python
+#%dir %{_libdir}/gimp/%{lib_api_version}/tool-plug-ins
+
+%{_datadir}/gimp/%{lib_api_version}/brushes/
+%{_datadir}/gimp/%{lib_api_version}/fractalexplorer/
+%{_datadir}/gimp/%{lib_api_version}/gfig/
+%{_datadir}/gimp/%{lib_api_version}/gflare/
+%{_datadir}/gimp/%{lib_api_version}/gimpressionist/
+%{_datadir}/gimp/%{lib_api_version}/gradients/
+# %{_datadir}/gimp/%{lib_api_version}/help/
+%{_datadir}/gimp/%{lib_api_version}/images/
+%{_datadir}/gimp/%{lib_api_version}/palettes/
+%{_datadir}/gimp/%{lib_api_version}/patterns/
+%{_datadir}/gimp/%{lib_api_version}/scripts/
+%{_datadir}/gimp/%{lib_api_version}/themes/
%dir %{_sysconfdir}/gimp
-%dir %{_sysconfdir}/gimp/%{interfacever}
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/controllerrc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gtkrc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/unitrc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/ps-menurc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/sessionrc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/templaterc
-%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/menurc
+%dir %{_sysconfdir}/gimp/%{lib_api_version}
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/controllerrc
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/gimprc
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/gtkrc
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/unitrc
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/sessionrc
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/templaterc
+%config(noreplace) %{_sysconfdir}/gimp/%{lib_api_version}/menurc
%{_bindir}/gimp-%{binver}
-%{_bindir}/gimp-remote-%{binver}
%{_bindir}/gimp-console-%{binver}
%if %{with convenience}
%{_bindir}/gimp
-%{_bindir}/gimp-remote
%{_bindir}/gimp-console
%endif
%{_mandir}/man1/gimp-%{binver}.1*
-%{_mandir}/man1/gimp-remote-%{binver}.1*
%{_mandir}/man1/gimp-console-%{binver}.1*
%{_mandir}/man5/gimprc-%{binver}.5*
%if %{with convenience}
%{_mandir}/man1/gimp.1*
-%{_mandir}/man1/gimp-remote.1*
%{_mandir}/man1/gimp-console.1*
%{_mandir}/man5/gimprc.5*
%endif
%{_datadir}/icons/hicolor/*/apps/gimp.png
-%{_datadir}/icons/hicolor/scalable/apps/gimp.svg
+
+%if %unstable
+%dir %{_sysconfdir}/libreport
+%dir %{_sysconfdir}/libreport/events.d
+%dir %{_sysconfdir}/libreport/events.d/gimp-unstable.conf
+%endif
%files libs
%defattr(-, root, root, 0755)
%doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimp-%{interfacever}.so.%{age}
-%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpbase-%{interfacever}.so.%{age}
-%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}
-%{_libdir}/libgimpconfig-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpconfig-%{interfacever}.so.%{age}
-%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpmath-%{interfacever}.so.%{age}
-%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}
-%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}
-%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpui-%{interfacever}.so.%{age}
-%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver}
-%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}
+%{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpbase-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpbase-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpcolor-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpcolor-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpconfig-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpconfig-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpmath-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpmath-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpmodule-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpmodule-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpthumb-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpthumb-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpui-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpui-%{lib_api_version}.so.%{interface_age}
+%{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro}
+%{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age}
%if %{with static}
%files devel -f gimp-static-files
@@ -490,20 +515,20 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/*.so
%dir %{_libdir}/gimp
-%dir %{_libdir}/gimp/%{interfacever}
-%dir %{_libdir}/gimp/%{interfacever}/modules
+%dir %{_libdir}/gimp/%{lib_api_version}
+%dir %{_libdir}/gimp/%{lib_api_version}/modules
%ifnos linux
%{_libdir}/*.la
-%{_libdir}/gimp/%{interfacever}/modules/*.la
+%{_libdir}/gimp/%{lib_api_version}/modules/*.la
%endif
%{_datadir}/aclocal/*.m4
-%{_includedir}/gimp-%{interfacever}
+%{_includedir}/gimp-%{lib_api_version}
%{_libdir}/pkgconfig/*
%files devel-tools
%defattr (-, root, root, 0755)
-%{_bindir}/gimptool-%{interfacever}
-%{_mandir}/man1/gimptool-%{interfacever}.1*
+%{_bindir}/gimptool-%{lib_api_version}
+%{_mandir}/man1/gimptool-%{lib_api_version}.1*
%if %{with convenience}
%{_bindir}/gimptool
@@ -512,9 +537,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files help-browser
%defattr (-, root, root, 0755)
-%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
+%{_libdir}/gimp/%{lib_api_version}/plug-ins/help-browser
%changelog
+* Tue Aug 30 2011 Nils Philippsen <nils at redhat.com> - 2:2.7.3-1
+- version 2.7.3 (unstable, see http://developer.gimp.org/NEWS for details)
+ - change license to GPLv3+/LGPLv3+
+ - update required versions of dependencies
+ - build with cairo-pdf, jasper, require jasper-devel for building
+ - build without poppler as that currently is GPLv2 only, thus incompatible
+ with LGPLv3 gimp libraries (use postscript plugin for PDF import
+ meanwhile), future poppler versions will be "GPLv2 or GPLv3", i.e.
+ compatible again
+ - clean up configure options, compiler/linker flags
+ - suppress abrt bug reporting for unstable releases
+ - remove all patches (obsolete, woo!)
+ - add new files, remove files that are not installed any longer
+- use %%global instead of %%define
+- replace hal, minorver, microver, interfacever, gimp_lang_ver macros with
+ gudev, lib_minor, lib_micro, lib_api_version, gettext_version macros
+- compute more version macros (ugly, but convenient)
+- use gudev from Fedora 15 on
+- use convenience macro for hardening binaries from F-16 on
+
* Fri Aug 12 2011 Nils Philippsen <nils at redhat.com> - 2:2.6.11-21
- actually apply startup-warning patch
- fix heap corruption and buffer overflow in file-gif-load plugin
diff --git a/sources b/sources
index 0fc8b66..56a552a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-bb2939fe13e54fc7255cef5d097bb5dd gimp-2.6.11.tar.bz2
-6693f03eddebb898720dccd758fbf30c gimp-2.6.11-11-autoreconf.patch.bz2
+851b55dc4af966e62ef5c8b679bcc623 gimp-2.7.3.tar.bz2
More information about the scm-commits
mailing list