From 6998d3f892eadaf176a8b532ab7e3c4298411560 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:15:19 +0000 Subject: [PATCH] auto-import changelog data from gimp-2.0.1-3.src.rpm Wed Apr 21 2004 Seth Nickell - Rename menu entry for .desktop file to "GIMP Image Editor" Tue Apr 20 2004 Nils Philippsen - update BuildRequires/Requires (#121236) Wed Apr 14 2004 Nils Philippsen - version 2.0.1 Sun Mar 28 2004 Nils Philippsen - fix slide script-fu Sat Mar 27 2004 Nils Philippsen - bump some Build/Requires: versions - change desktop file to actually run gimp-2.0 Wed Mar 24 2004 Nils Philippsen - version 2.0.0 Tue Mar 23 2004 Nils Philippsen - version 2.0rc1 Wed Mar 17 2004 Nils Philippsen - version 2.0pre4 --- .cvsignore | 2 +- gimp.spec | 71 +++++++++++++++++++++++++++++++++++++++--------------- sources | 2 +- 3 files changed, 54 insertions(+), 21 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7e995ac..60e47b6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gimp-2.0pre3.tar.bz2 +gimp-2.0.1.tar.bz2 diff --git a/gimp.spec b/gimp.spec index 0ba245e..28f471f 100644 --- a/gimp.spec +++ b/gimp.spec @@ -5,20 +5,20 @@ %define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0} %define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1} -%define subver 1.3 -%define age 26 +%define subver 2.0 +%define age 0 %define minorver 0 -%define microver 0 -%define prever 3 +%define microver 1 +%define prever 0 %define gimp_lang_ver 20 Summary: The GNU Image Manipulation Program BETA Name: gimp -Version: 2.0 +Version: 2.0.1 %if %prever -Release: 1.pre%{prever}.4.1 +Release: 1.%{prever}.1 %else -Release: 2.1 +Release: 3 %endif Epoch: 1 License: GPL, LGPL @@ -29,12 +29,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root # Obsoletes: gimp-libgimp Obsoletes: gimp2 gimp-beta <= %{version} Obsoletes: gimp-perl < %{epoch}:%{version} -BuildRequires: glib2-devel >= 2.2.0 -BuildRequires: gtk2-devel >= 1.3.10 -BuildRequires: pango-devel >= 1.2.0 +BuildRequires: glib2-devel >= 2.3.0 +BuildRequires: gtk2-devel >= 2.3.0 +BuildRequires: pango-devel >= 1.4.0 BuildRequires: fontconfig-devel >= 2.2.0 +BuildRequires: gtkhtml2-devel +BuildRequires: python-devel +BuildRequires: pygtk2-devel BuildRequires: librsvg2-devel -BuildRequires: XFree86-devel +BuildRequires: libtiff-devel +BuildRequires: libpng-devel +BuildRequires: libmng-devel +BuildRequires: libexif-devel +BuildRequires: xorg-x11-devel BuildRequires: gimp-print-devel >= 4.2.0 BuildRequires: automake >= 1.7 BuildRequires: autoconf >= 2.54 @@ -42,10 +49,11 @@ BuildRequires: libtool >= 1.5 BuildRequires: perl Requires: glib2 >= 2.3.0 Requires: gtk2 >= 2.3.0 -Requires: pango >= 1.3.0 +Requires: pango >= 1.4.0 Requires: fontconfig >= 2.2.0 +Requires: gimp-print >= 4.2.0 %if %prever -Source0: ftp://ftp.gimp.org/pub/gimp/v%{version}/testing/gimp-%{version}pre%{prever}.tar.bz2 +Source0: ftp://ftp.gimp.org/pub/gimp/v%{version}/testing/gimp-%{version}%{prever}.tar.bz2 %else Source0: ftp://ftp.gimp.org/pub/gimp/v%{version}/v%{version}/gimp-%{version}.tar.bz2 %endif @@ -98,7 +106,7 @@ GIMP image manipulation program. %prep %if %prever -%setup -q -n gimp-%{version}pre%{prever} +%setup -q -n gimp-%{version}%{prever} %else %setup -q %endif @@ -241,9 +249,9 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %if %_enable_convenience # install convenience symlinks -ln -s gimp-%{subver} %{buildroot}/%{_bindir}/gimp -ln -s gimp-remote-%{subver} %{buildroot}/%{_bindir}/gimp-remote -ln -s gimptool-%{version} %{buildroot}/%{_bindir}/gimptool +[ ! -L %{buildroot}/%{_bindir}/gimp ] && ln -s gimp-%{subver} %{buildroot}/%{_bindir}/gimp +[ ! -L %{buildroot}/%{_bindir}/gimp-remote ] && ln -s gimp-remote-%{subver} %{buildroot}/%{_bindir}/gimp-remote +[ ! -L %{buildroot}/%{_bindir}/gimptool ] && ln -s gimptool-%{subver} %{buildroot}/%{_bindir}/gimptool %endif %clean @@ -328,7 +336,7 @@ ln -s gimptool-%{version} %{buildroot}/%{_bindir}/gimptool %{_bindir}/gimp-%{subver} %{_bindir}/gimp-remote-%{subver} -%{_bindir}/gimptool-%{version} +%{_bindir}/gimptool-%{subver} #%{_bindir}/embedxpm #%{_bindir}/escputil-%{subver} @@ -341,7 +349,7 @@ ln -s gimptool-%{version} %{buildroot}/%{_bindir}/gimptool %defattr (-, root, root) %{_mandir}/man1/gimp-%{subver}.1* %{_mandir}/man1/gimp-remote-%{subver}.1* -%{_mandir}/man1/gimptool-%{version}.1* +%{_mandir}/man1/gimptool-%{subver}.1* #%{_mandir}/man1/escputil-%{subver}.1.* %{_mandir}/man5/gimprc-%{subver}.5* @@ -369,6 +377,31 @@ ln -s gimptool-%{version} %{buildroot}/%{_bindir}/gimptool %endif %changelog +* Wed Apr 21 2004 Seth Nickell +- Rename menu entry for .desktop file to "GIMP Image Editor" + +* Tue Apr 20 2004 Nils Philippsen +- update BuildRequires/Requires (#121236) + +* Wed Apr 14 2004 Nils Philippsen +- version 2.0.1 + +* Sun Mar 28 2004 Nils Philippsen +- fix slide script-fu + +* Sat Mar 27 2004 Nils Philippsen +- bump some Build/Requires: versions +- change desktop file to actually run gimp-2.0 + +* Wed Mar 24 2004 Nils Philippsen +- version 2.0.0 + +* Tue Mar 23 2004 Nils Philippsen +- version 2.0rc1 + +* Wed Mar 17 2004 Nils Philippsen +- version 2.0pre4 + * Tue Mar 02 2004 Elliot Lee - rebuilt diff --git a/sources b/sources index 704f9eb..13e6f3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4d45d83cba87bc9d45399b0e6bce27c gimp-2.0pre3.tar.bz2 +fb7f0d3dcde6c77dc7960c0986a6e0f5 gimp-2.0.1.tar.bz2