rpms/gimp/devel .cvsignore, 1.43, 1.44 gimp.spec, 1.162, 1.163 sources, 1.43, 1.44
Nils Philippsen
nphilipp at fedoraproject.org
Mon Oct 6 15:50:43 UTC 2008
- Previous message: rpms/OmegaT/F-8 OmegaT-04-get-rid-of-MRJAdapter.patch, NONE, 1.1 OmegaT-ant.properties, NONE, 1.1 OmegaT-build.xml, NONE, 1.1 OmegaT-extra-jars-in-new-location.patch, NONE, 1.1 OmegaT-lib-mnemonics-build.xml, NONE, 1.1 OmegaT-manifes-template.patch, NONE, 1.1 OmegaT.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/gimp/devel gimp-2.6.0-xdg-open.patch, NONE, 1.1 gimp-2.4.0-xdg-open.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: nphilipp
Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9095
Modified Files:
.cvsignore gimp.spec sources
Log Message:
version 2.6.0
remove obsolete htmlview patch
remove obsolete distro version dependent defaults
don't use custom CFLAGS
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/.cvsignore,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- .cvsignore 22 Aug 2008 15:46:30 -0000 1.43
+++ .cvsignore 6 Oct 2008 15:50:13 -0000 1.44
@@ -1 +1 @@
-gimp-2.4.7.tar.bz2
+gimp-2.6.0.tar.bz2
Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- gimp.spec 22 Sep 2008 08:07:06 -0000 1.162
+++ gimp.spec 6 Oct 2008 15:50:13 -0000 1.163
@@ -3,55 +3,35 @@
# package will be built:
#
# modular_x: modular X dependencies
+%bcond_without modular_x
# lcms: lcms support
+%bcond_without lcms
# python: python support
+%bcond_without python
# mp: multi processor support
+%bcond_without mp
# static: build static libraries
+%bcond_with static
# print: build the print plugin (if you don't build it externally)
+%bcond_without print
# gutenprint: require gutenprint-plugin (instead of gimp-print-plugin) if
# internal print plugin isn't built
-# convenience: install convenience symlinks
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-%bcond_without modular_x
-%bcond_without lcms
-%else
-%bcond_with modular_x
-%bcond_with lcms
-%endif
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 7 || 0%{?rhel} >= 6
%bcond_without gutenprint
-%bcond_without xdg_open
-%else
-%bcond_with gutenprint
-%bcond_with xdg_open
-%endif
-
-%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 8 || 0%{?rhel} >= 6
-%bcond_without print
-%else
-%bcond_with print
-%endif
-
-%bcond_without python
-%bcond_without mp
+# convenience: install convenience symlinks
%bcond_without convenience
-%bcond_with static
-
-#
-#
+# webkit: use internal WebKit based help browser
+%bcond_without webkit
Summary: GNU Image Manipulation Program
Name: gimp
-Version: 2.4.7
-%define binver 2.4
+Version: 2.6.0
+%define binver 2.6
%define gimp_lang_ver 20
%define interfacever 2.0
%define age 0
-%define minorver 400
+%define minorver 600
%define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 4%{?dist}
+Release: 1%{?dist}
Epoch: 2
License: GPLv2+
Group: Applications/Multimedia
@@ -59,14 +39,17 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
Obsoletes: gimp-perl < 2:2.0
BuildRequires: alsa-lib-devel >= 1.0.0
+BuildRequires: babl-devel >= 0.0.22
+BuildRequires: cairo-devel >= 1.4.10
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: glib2-devel >= 2.12.3
+BuildRequires: gegl-devel >= 0.0.18
+BuildRequires: glib2-devel >= 2.16.1
BuildRequires: gnome-keyring-devel >= 0.4.5
BuildRequires: gnome-vfs2-devel >= 2.10.0
-BuildRequires: gtk2-devel >= 2.10.13
+BuildRequires: gtk2-devel >= 2.12.1
BuildRequires: gtk-doc >= 1.0
BuildRequires: gtkhtml2-devel >= 2.0.0
BuildRequires: hal-devel >= 0.5.7
@@ -78,11 +61,14 @@
BuildRequires: librsvg2-devel >= 2.14.0
BuildRequires: libtiff-devel
BuildRequires: libwmf-devel >= 0.2.8
-BuildRequires: pango-devel >= 1.12.2
+BuildRequires: pango-devel >= 1.18.0
BuildRequires: poppler-devel >= 0.4.1
BuildRequires: python-devel
BuildRequires: pygtk2-devel >= 2.10.4
BuildRequires: pygobject2-devel
+%if %{with webkit}
+BuildRequires: WebKit-gtk-devel >= 1.0.0
+%endif
%if %{with modular_x}
BuildRequires: libX11-devel
BuildRequires: libXmu-devel
@@ -94,7 +80,7 @@
BuildRequires: gettext
BuildRequires: findutils
%if %{with lcms}
-BuildRequires: lcms-devel
+BuildRequires: lcms-devel >= 1.16
%endif
Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -111,16 +97,11 @@
%endif
%endif
Requires: hicolor-icon-theme
-%if %{with xdg_open}
Requires: xdg-utils
-%else
-Requires: htmlview
-%endif
Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2
Source1: gimp-plugin-mgr.in
-Patch0: gimp-2.4.0-htmlview.patch
-Patch1: gimp-2.4.0-xdg-open.patch
+Patch0: gimp-2.6.0-xdg-open.patch
%description
GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -171,26 +152,21 @@
prefer gutenprint over (external) gimp-print plugin:
%{with gutenprint}
%endif
-use xdg-open instead of htmlview: %{with xdg_open}
+use internal webkit based help browser: %{with webkit}
EOF
%setup -q -n gimp-%{version}
-%if %{with xdg_open}
-%patch1 -p1 -b .xdg-open
-%else
-%patch0 -p1 -b .htmlview
-%endif
+%patch0 -p1 -b .xdg-open
%build
LIBAA="disable"; export LIBAA
if [ ! -f configure ]; then
./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix}
fi
-CFLAGS="%optflags -fomit-frame-pointer" \
%configure \
- --disable-perl \
+ --disable-perl --enable-gimp-remote \
%if %{with python}
--enable-python \
%else
@@ -221,6 +197,11 @@
%ifos linux
--with-linux-input \
%endif
+%if %{with webkit}
+ --with-webkit \
+%else
+ --without-webkit \
+%endif
--with-libtiff --with-libjpeg --with-libpng --with-libmng --with-libexif \
--with-gtkhtml2 --with-librsvg --with-poppler --with-gnomevfs --with-alsa \
--with-dbus --with-script-fu
@@ -337,8 +318,6 @@
%doc AUTHORS COPYING ChangeLog NEWS README
%doc docs/*.xcf*
%{_datadir}/applications/*.desktop
-%{_datadir}/application-registry/*.applications
-%{_datadir}/mime-info/*.keys
%dir %{_datadir}/gimp
%dir %{_datadir}/gimp/%{interfacever}
@@ -451,6 +430,12 @@
%{_libdir}/pkgconfig/*
%changelog
+* Thu Oct 02 2008 Nils Philippsen <nils at redhat.com> - 2:2.6.0-1
+- version 2.6.0
+- remove obsolete htmlview patch
+- remove obsolete distro version dependent defaults
+- don't use custom CFLAGS
+
* Mon Sep 22 2008 Nils Philippsen <nils at redhat.com> - 2:2.4.7-4
- don't require desktop-file-utils (#463049, patch by Ville Skyttä)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 22 Aug 2008 15:46:30 -0000 1.43
+++ sources 6 Oct 2008 15:50:13 -0000 1.44
@@ -1 +1 @@
-8d0e059597d70fbdeb77e6447bae29c4 gimp-2.4.7.tar.bz2
+e5ac955fee8b376d431e4693027d7640 gimp-2.6.0.tar.bz2
- Previous message: rpms/OmegaT/F-8 OmegaT-04-get-rid-of-MRJAdapter.patch, NONE, 1.1 OmegaT-ant.properties, NONE, 1.1 OmegaT-build.xml, NONE, 1.1 OmegaT-extra-jars-in-new-location.patch, NONE, 1.1 OmegaT-lib-mnemonics-build.xml, NONE, 1.1 OmegaT-manifes-template.patch, NONE, 1.1 OmegaT.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/gimp/devel gimp-2.6.0-xdg-open.patch, NONE, 1.1 gimp-2.4.0-xdg-open.patch, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list