Author: wrobell Date: Thu May 3 18:17:26 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- merged from DEVEL
---- Files affected:
packages/gimp:
gimp-home_etc.patch (1.2 -> 1.3) , gimp.spec (1.348 -> 1.349)
---- Diffs:
================================================================
Index: packages/gimp/gimp-home_etc.patch
diff -u packages/gimp/gimp-home_etc.patch:1.2
packages/gimp/gimp-home_etc.patch:1.3
--- packages/gimp/gimp-home_etc.patch:1.2 Thu Jan 8 12:04:45 2004
+++ packages/gimp/gimp-home_etc.patch Thu May 3 20:17:21 2012
@@ -1,19 +1,20 @@
-diff -Nru gimp-1.3.22.orig/libgimpbase/gimpenv.c
gimp-1.3.22/libgimpbase/gimpenv.c
---- gimp-1.3.22.orig/libgimpbase/gimpenv.c 2003-10-25 21:02:18.000000000
+0200
-+++ gimp-1.3.22/libgimpbase/gimpenv.c 2003-11-22 19:23:31.000000000 +0100
-@@ -95,13 +95,13 @@
- static gchar *gimp_dir = NULL;
+--- gimp-2.7.1/libgimpbase/gimpenv.c~ 2010-06-13 21:15:08.000000000 +0200
++++ gimp-2.7.1/libgimpbase/gimpenv.c 2010-07-19 10:30:13.787427066 +0200
+@@ -155,7 +155,7 @@
+ static gchar *last_env_gimp_dir = NULL;
const gchar *env_gimp_dir;
- const gchar *home_dir;
-+ const gchar *home_dir = g_getenv("HOME_ETC");
-
- if (gimp_dir)
- return gimp_dir;
++ const gchar *home_dir = g_getenv("HOME_ETC");;
env_gimp_dir = g_getenv ("GIMP2_DIRECTORY");
-- home_dir = g_get_home_dir ();
-+ if (!home_dir) home_dir = g_get_home_dir ();
+
+@@ -194,7 +194,7 @@
+ g_free (last_env_gimp_dir);
+ last_env_gimp_dir = g_strdup (env_gimp_dir);
+
+- home_dir = g_get_home_dir ();
++ if (!home_dir) home_dir = g_get_home_dir ();
if (env_gimp_dir)
{
================================================================
Index: packages/gimp/gimp.spec
diff -u packages/gimp/gimp.spec:1.348 packages/gimp/gimp.spec:1.349
--- packages/gimp/gimp.spec:1.348 Thu Feb 9 22:51:56 2012
+++ packages/gimp/gimp.spec Thu May 3 20:17:21 2012
@@ -1,16 +1,13 @@
# $Revision$, $Date$
#
+# TODO: some unpackaged files
+#
# Conditional build:
%bcond_without aalib # without aa plugin (which requires aalib)
-%bcond_without gnomevfs # without GNOME VFS support
-%bcond_without gnome # convenient alias for gnomevfs
%bcond_without python # without python plugins
%bcond_without webkit # without webkit-based help browser
%bcond_with posix_shm # with POSIX SHM (default is SysV SHM)
#
-%if %{without gnome}
-%undefine with_gnomevfs
-%endif
%define mver 2.0
Summary: The GNU Image Manipulation Program
Summary(de.UTF-8): Das GNU-Bildbearbeitungs-Programm
@@ -24,13 +21,13 @@
Summary(zh_CN.UTF-8): [图像]GNU图象处理工具
Summary(zh_TW.UTF-8): [圖像]GNU圖象處理工具
Name: gimp
-Version: 2.6.12
-Release: 3
+Version: 2.8.0
+Release: 0.1
Epoch: 1
-License: GPL v2+
+License: GPL v3+
Group: X11/Applications/Graphics
-Source0: ftp://ftp.gimp.org/pub/gimp/v2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 9f876ee63a0c4a4c83f50f32fb3bbe63
+Source0: ftp://ftp.gimp.org/pub/gimp/v2.8/%{name}-%{version}.tar.bz2
+# Source0-md5: 28997d14055f15db063eb92e1c8a7ebb
Patch0: %{name}-home_etc.patch
Patch1: %{name}-desktop.patch
Patch2: %{name}-gcc4.patch
@@ -40,13 +37,12 @@
BuildRequires: alsa-lib-devel >= 1.0.11
BuildRequires: autoconf >= 2.54
BuildRequires: automake
-BuildRequires: babl-devel >= 0.0.22
+BuildRequires: babl-devel >= 0.1.4
BuildRequires: curl-devel >= 7.15.1
BuildRequires: cairo-devel >= 1.4.10
BuildRequires: dbus-glib-devel >= 0.70
BuildRequires: docbook-dtd412-xml
-BuildRequires: fontconfig-devel >= 1:2.2.0
-BuildRequires: gegl-devel >= 0.0.18
+BuildRequires: gegl-devel >= 0.2.0
BuildRequires: gettext-devel
BuildRequires: giflib-devel
BuildRequires: glib2-devel >= 1:2.16.1
@@ -56,7 +52,6 @@
BuildRequires: intltool >= 0.36.3
BuildRequires: iso-codes
BuildRequires: lcms-devel >= 1.16
-BuildRequires: libart_lgpl-devel
BuildRequires: libexif-devel >= 0.6.15
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
@@ -68,6 +63,7 @@
BuildRequires: pango-devel >= 1:1.18.0
BuildRequires: pkgconfig >= 1:0.16
BuildRequires: poppler-devel >= 0.17
+%{?with_python:BuildRequires: python-pygtk-devel >= 1:2.10.4}
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: udev-glib-devel >= 1:167
@@ -75,18 +71,7 @@
BuildRequires: xorg-lib-libXfixes-devel
BuildRequires: xorg-lib-libXmu-devel
BuildRequires: xorg-lib-libXpm-devel
-BuildRequires: zlib-devel
-%if %{with gnomevfs}
-BuildRequires: gnome-vfs2-devel >= 2.15.91
-BuildRequires: libgnome-keyring-devel >= 0.5.1
-BuildRequires: libgnomeui-devel >= 2.15.91
-%endif
-%if %{with python}
-BuildRequires: python-devel >= 1:2.5
-BuildRequires: python-pygtk-devel >= 2:2.10.4
-%endif
-Requires(post,postun): gtk-update-icon-cache
-Requires(post,postun): hicolor-icon-theme
+Requires(post,postun): gtk+2 >= 2:2.10.13
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: curl >= 7.15.1
Requires: dbus-glib >= 0.70
@@ -338,10 +323,8 @@
%{__autoheader}
%{__automake}
%configure \
- %{!?with_gnomevfs:--disable-gnomevfs} \
%{!?with_python:--disable-python} \
--enable-default-binary \
- --enable-gimp-remote \
--enable-gtk-doc \
--enable-static \
--with-html-dir=%{_gtkdocdir} \
@@ -360,9 +343,11 @@
ln -s gimptool-2.0 $RPM_BUILD_ROOT%{_bindir}/gimptool
echo '.so gimptool-2.0.1' > $RPM_BUILD_ROOT%{_mandir}/man1/gimptool.1
-# remove unneeded files
+# Remove obsolete files
%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/modules/*.{a,la}
+%if %{with python}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/gimp/%{mver}/python/*.{a,la,py}
+%endif
%find_lang %{name} --all-name
@@ -387,21 +372,14 @@
%doc AUTHORS ChangeLog LICENSE NEWS README
%doc docs/Wilber*
-%attr(755,root,root) %{_bindir}/gimp-2.6
+%attr(755,root,root) %{_bindir}/gimp-2.8
%attr(755,root,root) %{_bindir}/gimp
-%attr(755,root,root) %{_bindir}/gimp-console-2.6
+%attr(755,root,root) %{_bindir}/gimp-console-2.8
%attr(755,root,root) %{_bindir}/gimp-console
-%attr(755,root,root) %{_bindir}/gimp-remote-2.6
-%attr(755,root,root) %{_bindir}/gimp-remote
%{_desktopdir}/gimp.desktop
-%{_mandir}/man1/gimp-2.6.1*
-%{_mandir}/man1/gimp.1*
-%{_mandir}/man1/gimp-console-2.6.1*
-%{_mandir}/man1/gimp-console.1*
-%{_mandir}/man1/gimp-remote-2.6.1*
-%{_mandir}/man1/gimp-remote.1*
-%{_mandir}/man5/gimprc-2.6.5*
-%{_mandir}/man5/gimprc.5*
+%{_mandir}/man1/gimp[-.]*
+%{_mandir}/man1/gimp-console[-.]*
+%{_mandir}/man5/gimprc[-.]*
%dir %{_libdir}/gimp
%dir %{_libdir}/gimp/%{mver}
@@ -425,6 +403,7 @@
%dir %{_datadir}/gimp
%dir %{_datadir}/gimp/%{mver}
%{_datadir}/gimp/%{mver}/brushes
+%{_datadir}/gimp/%{mver}/dynamics
%{_datadir}/gimp/%{mver}/fractalexplorer
%{_datadir}/gimp/%{mver}/gfig
%{_datadir}/gimp/%{mver}/gflare
@@ -435,8 +414,11 @@
%{_datadir}/gimp/%{mver}/palettes
%{_datadir}/gimp/%{mver}/patterns
%{_datadir}/gimp/%{mver}/scripts
+%{_datadir}/gimp/%{mver}/tags
%{_datadir}/gimp/%{mver}/themes
%{_datadir}/gimp/%{mver}/tips
+%{_datadir}/gimp/%{mver}/tool-presets
+%{_datadir}/gimp/%{mver}/ui
%dir %{_sysconfdir}/%{name}
%dir %{_sysconfdir}/%{name}/%{mver}
@@ -445,7 +427,6 @@
%config %{_sysconfdir}/%{name}/%{mver}/controllerrc
%config %{_sysconfdir}/%{name}/%{mver}/gtkrc*
%config %{_sysconfdir}/%{name}/%{mver}/menurc
-%config %{_sysconfdir}/%{name}/%{mver}/ps-menurc
%config %{_sysconfdir}/%{name}/%{mver}/sessionrc
%config %{_sysconfdir}/%{name}/%{mver}/unitrc
@@ -541,6 +522,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.349 2012/05/03 18:17:21 wrobell
+- merged from DEVEL
+
Revision 1.348 2012/02/09 21:51:56 arekm
- release 3
@@ -641,6 +625,62 @@
Revision 1.317 2009/12/11 14:55:22 arekm
- up to 2.6.8
+
+Revision 1.316.2.18 2012/05/03 18:11:56 wrobell
+- ver. 2.8.0 (nfy, just fetching sources)
+
+Revision 1.316.2.17 2012/04/18 19:53:36 wrobell
+- added missing files
+
+Revision 1.316.2.16 2012/04/18 19:00:21 wrobell
+- libart_lgpl lib is obsolete
+
+Revision 1.316.2.15 2012/04/18 18:57:24 wrobell
+- hal is not supported by gimp 2.8
+
+Revision 1.316.2.14 2012/04/18 18:56:31 wrobell
+- fixed python bcond (error when removing python files while building
+ without python)
+
+Revision 1.316.2.13 2012/04/18 18:55:26 wrobell
+- gnomevfs is not supported by gimp 2.8 (recommit)
+
+Revision 1.316.2.12 2012/04/18 18:53:36 wrobell
+- gnomevfs is not supported by gimp 2.8
+
+Revision 1.316.2.11 2012/04/17 20:26:14 wrobell
+- started to update to ver. 2.8.0 rc1
+
+Revision 1.316.2.10 2011/09/08 12:50:03 lisu
+- TODO
+
+Revision 1.316.2.9 2011/09/08 12:31:21 lisu
+- gimp-remote and ps-menurc removed by upstream (see NEWS)
+
+Revision 1.316.2.8 2011/09/08 12:05:14 lisu
+- drop obsoleted rm
+
+Revision 1.316.2.7 2011/09/08 11:43:43 lisu
+- updated BRs
+
+Revision 1.316.2.6 2011/09/08 09:33:27 lisu
+- updated to 2.7.3
+
+Revision 1.316.2.5 2010/07/19 08:55:39 lisu
+- up to 2.7.1
+- -libpng.patch removed, it's now applied upstream
+
+Revision 1.316.2.4 2010/06/24 08:02:35 lisu
+- add -libpng.patch (from HEAD)
+
+Revision 1.316.2.3 2009/12/11 15:53:17 sparky
+- BR: docbook-dtd412-xml
+
+Revision 1.316.2.2 2009/08/21 14:02:51 lisu
+- GPL v3+ license
+
+Revision 1.316.2.1 2009/08/21 13:26:49 lisu
+- up to 2.7.0
Revision 1.316 2009/08/15 22:01:52 arekm
- up to 2.6.7
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/gimp/gimp-home_etc.patch?r1=1.2&r2=1.3
http://cvs.pld-linux.org/packages/gimp/gimp.spec?r1=1.348&r2=1.349
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
