Accepting request 114795 from GNOME:Apps

Pushing G:A

OBS-URL: https://build.opensuse.org/request/show/114795
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gimp?expand=0&rev=75
This commit is contained in:
Stephan Kulow 2012-04-23 14:10:30 +00:00 committed by Git OBS Bridge
parent c89b1f9fcc
commit 52fc3d9d1f
4 changed files with 129 additions and 77 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d553c9f1c07f59fa7b7ce9cc5f84ce59bf4e9dfb5b6ee4bd8718b74b947aec62
size 16745411

3
gimp-2.8.0-RC1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e78f9aedddd6afd14d3c2c3c3aaee9eda3c495f85a566e63d60ded88ce52bb3f
size 20004191

View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Sat Apr 7 08:08:21 UTC 2012 - vuntz@opensuse.org
- Update license from GPL-2.0+ to GPL-3.0+, following upstream
change.
- Completely drop HAL-related packaging since it is now gone
upstream:
+ Remove build_hal macro
+ Remove optional hal-devel BuildRequires.
+ Remove optional gimp-module-hal subpackage.
+ Note that we already have a Obsoletes for gimp-module-hal.
- Add pkgconfig(gudev-1.0) BuildRequires for the new gudev input
module.
- Add ghostscript-devel, ghostscript-library, libbz2-devel,
libjasper-devel, pkgconfig(atk), pkgconfig(xcursor)
BuildRequires: new dependencies upstream.
+ Note about ghostscript-library: ideally, we'd avoid listing it
explicitly, but in OBS, ghostscript-mini is preferred by
default, but it is not enough for gimp.
- Add explicit pkgconfig(gdk-pixbuf-2.0) BuildRequires so it can be
versioned.
- Add explicit libjpeg-devel, xorg-x11-libXpm-devel, zlib-devel
BuildRequires: they were missing before.
- Add libxslt-tools BuildRequires (or libxslt-devel on versions of
openSUSE <= 12.1) to have xsltproc installed.
- Add fdupes BuildRequires and use %fdupes in %install to avoid
duplicated files.
- Change gimp-doc Obsoletes in devel subpackage from <= to < to
avoid rpmlint warning about self-obsoletion.
-------------------------------------------------------------------
Fri Apr 6 17:44:10 UTC 2012 - dimstar@opensuse.org
- Update to 2.8.0-RC1:
+ User Interface:
- Single-Window Mode
- Multi-Column Dock Windows
- More Screen Real Estate For Dockable Dialogs
- Save And Export
- Layer Groups
- Tools Drawn With Cairo
- On-Canvas Text Editing
- Keyboard Shortcut Changes
- Simple Math In Size Entries
+ Tools & Plug-ins:
- Brush System Improvements
- Tool Preset Improvements
- Cage Transform Tool
- File Plug-Ins
- For Tablet Users
- Resource Tagging
+ Miscellaneous:
- Enhancements to scripting abilities
- API changes
+ For detailed changes, see NEWS file and
http://www.gimp.org/release-notes/gimp-2.7.html
-------------------------------------------------------------------
Wed Feb 1 09:09:46 UTC 2012 - vuntz@opensuse.org

143
gimp.spec
View File

@ -15,47 +15,63 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define build_hal 0%{?suse_version} <= 1140
%global abiver 4
%global apiver 2.0
Name: gimp
BuildRequires: aalib-devel
BuildRequires: alsa-devel
BuildRequires: babl-devel
BuildRequires: cairo-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: fontconfig-devel
BuildRequires: gegl-devel
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
%if %{build_hal}
BuildRequires: hal-devel
%endif
BuildRequires: intltool
BuildRequires: alsa-devel >= 1.0.0
BuildRequires: babl-devel >= 0.1.10
BuildRequires: cairo-devel >= 1.10.2
BuildRequires: dbus-1-glib-devel >= 0.70
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.
BuildRequires: ghostscript-library
BuildRequires: glib2-devel >= 2.30.2
BuildRequires: gtk2-devel >= 2.24.10
BuildRequires: intltool >= 0.40.1
BuildRequires: iso-codes-devel
BuildRequires: libexif-devel
BuildRequires: liblcms-devel
BuildRequires: libbz2-devel
BuildRequires: libexif-devel >= 0.6.15
BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: liblcms-devel >= 1.16
BuildRequires: libmng-devel
BuildRequires: libpng-devel
BuildRequires: libpoppler-glib-devel
BuildRequires: librsvg-devel
BuildRequires: libpng-devel >= 1.2.37
BuildRequires: libpoppler-glib-devel >= 0.12.4
BuildRequires: librsvg-devel >= 2.34.2
BuildRequires: libtiff-devel
BuildRequires: libwebkit-devel
BuildRequires: libwmf-devel
BuildRequires: pango-devel
BuildRequires: python-gtk-devel
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: pango-devel >= 1.29.4
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(gdk-pixbuf-2.0) >= 2.24.1
BuildRequires: pkgconfig(gudev-1.0) >= 167
BuildRequires: pkgconfig(xcursor)
Url: http://www.gimp.org/
Version: 2.6.12
Version: 2.7.99_2.8.0rc1
Release: 0
%define _version 2.8.0-RC1
Summary: The GNU Image Manipulation Program
License: GPL-2.0+
License: GPL-3.0+
Group: Productivity/Graphics/Bitmap Editors
Source: ftp://ftp.gimp.org/pub/gimp/stable/%{name}-%{version}.tar.bz2
Source: ftp://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{_version}.tar.bz2
Source1: macros.gimp
# openSUSE palette file
Source2: openSUSE.gpl
@ -67,13 +83,12 @@ Recommends: %{name}-plugins-python = %{version}
Recommends: iso-codes
Suggests: AdobeICCProfiles
Suggests: gimp-2.0-scanner-plugin
Provides: gimp(api) = %{apiver} gimp(abi) = %{abiver}
Provides: gimp-2.0 = %{version}
Provides: gimp(abi) = %{abiver}
Provides: gimp(api) = %{apiver}
Obsoletes: gimp-unstable < 2.6.0
%if ! %{build_hal}
# Obsolete hal subpackage which we had until 11.4.
Obsoletes: %{name}-module-hal <= %{version}
%endif
Obsoletes: %{name}-module-hal < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -138,11 +153,11 @@ Supplements: packageand(%{name}:branding-upstream)
# It is technically compatible with 2.4, but upstream branding has version specific image:
Conflicts: %{name} < 2.6.0
BuildArch: noarch
## WARNING WARNING WARNING: see warning in %files section
## WARNING WARNING WARNING: see warning in %%files section
#BRAND: /usr/share/gimp/2.0/images/gimp-splash.png is a splash screen in
#BRAND: GIMP, original size is 300x400. Bottom part displays "just
#BRAND: starting" text and progress bar.
## WARNING WARNING WARNING: see warning in %files section
## WARNING WARNING WARNING: see warning in %%files section
%description branding-upstream
The GIMP (GNU Image Manipulation Program) is a powerful image
@ -162,7 +177,8 @@ This package contains the upstream splash screen for the GIMP.
%package plugins-python
Summary: The GNU Image Manipulation Program - python-gtk based plugins
Group: Productivity/Graphics/Bitmap Editors
Requires: %{name} = %{version} python-gtk
Requires: %{name} = %{version}
Requires: python-gtk
Supplements: %{name}
Provides: gimp-2.0-plugins-python = %{version}
Obsoletes: gimp-unstable-plugins-python < 2.6.0
@ -189,9 +205,9 @@ Group: Productivity/Graphics/Bitmap Editors
Requires: libgimp-2_0-0 = %{version}
Requires: libgimpui-2_0-0 = %{version}
Provides: gimp-2.0-devel = %{version}
Obsoletes: gimp-unstable-devel < 2.6.0
Obsoletes: gimp-doc <= 2.6.4
Provides: gimp-doc = 2.6.4
Obsoletes: gimp-doc < 2.6.4
Obsoletes: gimp-unstable-devel < 2.6.0
%description devel
The GIMP (GNU Image Manipulation Program) is a powerful image
@ -216,33 +232,9 @@ Supplements: packageand(%{name}:gimp-help)
This package contains the help browser for the GIMP.
%if %{build_hal}
%package module-hal
Summary: The GNU Image Manipulation Program - module to detect input devices with HAL
Group: Productivity/Graphics/Bitmap Editors
Requires: %{name} = %{version}
Supplements: packageand(%{name}:hal)
%description module-hal
The GIMP (GNU Image Manipulation Program) is a powerful image
composition and editing program, which can be extremely useful for
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 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
%setup -q -n %{name}-%{_version}
translation-update-upstream
translation-update-upstream po-libgimp gimp20-libgimp
translation-update-upstream po-python gimp20-python
@ -300,6 +292,8 @@ sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \
< $RPM_SOURCE_DIR/macros.gimp > macros.gimp
install -m 644 -c macros.gimp \
$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.gimp
%fdupes %{buildroot}%{_datadir}/gtk-doc/
%fdupes %{buildroot}%{_libdir}/gimp/2.0/python/
%if 0%{?suse_version} > 1130
@ -336,15 +330,21 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gimp-console-2.?
%{_datadir}/applications/gimp.desktop
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/*/apps/*.svg
%{_datadir}/gimp/
%exclude %{_datadir}/gimp/2.0/images/gimp-splash.png
%{_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
# Explicitly list modules so we don't lose one by accident
%{_libdir}/gimp/2.0/modules/libcolor-selector-cmyk.so
%{_libdir}/gimp/2.0/modules/libcolor-selector-water.so
%{_libdir}/gimp/2.0/modules/libcolor-selector-wheel.so
%{_libdir}/gimp/2.0/modules/libcontroller-linux-input.so
%{_libdir}/gimp/2.0/modules/libcontroller-midi.so
%{_libdir}/gimp/2.0/modules/libdisplay-filter-color-blind.so
%{_libdir}/gimp/2.0/modules/libdisplay-filter-gamma.so
%{_libdir}/gimp/2.0/modules/libdisplay-filter-high-contrast.so
%{_libdir}/gimp/2.0/modules/libdisplay-filter-lcms.so
%{_libdir}/gimp/2.0/modules/libdisplay-filter-proof.so
%doc %{_mandir}/man?/gimp.*
%doc %{_mandir}/man?/gimp-2.?.*
%doc %{_mandir}/man?/gimp-console.*
@ -398,13 +398,6 @@ rm -rf $RPM_BUILD_ROOT
%{_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
%files devel
@ -412,10 +405,12 @@ rm -rf $RPM_BUILD_ROOT
%doc README.i18n
%{_bindir}/gimptool-2.0
%doc %{_mandir}/man?/gimptool-2.0.*
%{_datadir}/aclocal/*.m4
%{_includedir}/*
%{_includedir}/gimp-2.0/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/aclocal/gimp-2.0.m4
%{_libdir}/pkgconfig/gimp-2.0.pc
%{_libdir}/pkgconfig/gimpthumb-2.0.pc
%{_libdir}/pkgconfig/gimpui-2.0.pc
# Own these repositories to not depend on gtk-doc while building:
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html