diff --git a/.cvsignore b/.cvsignore index 3323db1..dcf3698 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -gimp-1.2.3-newperl.patch.bz2 gimp-1.2.3-wget-fix.patch.bz2 -gimp-1.2.3.tar.bz2 +gimp-1.2.5.tar.bz2 diff --git a/gimp.spec b/gimp.spec index 71f9edf..69c0e18 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,33 +1,39 @@ -%define subver 1.2 -%define age 0 -%define microver 3 +%define subver 1.2 +%define age 0 +%define microver 5 Summary: The GNU Image Manipulation Program. -Name: gimp -Version: %{subver}.%{microver} -Release: 16 -Epoch: 1 -Copyright: GPL, LGPL +Name: gimp +Version: %{subver}.%{microver} +Release: 1 +Epoch: 1 +License: GPL, LGPL Group: Applications/Multimedia -URL: http://www.gimp.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Obsoletes: gimp-data-min -Obsoletes: gimp-libgimp -Requires: gtk+ >= 1.2.0 -Requires: gimp-print-plugin -BuildRequires: gtk+-devel -BuildRequires: glib-devel +URL: http://www.gimp.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +Obsoletes: gimp-data-min +Obsoletes: gimp-libgimp +Requires: gtk+ >= 1.2.0 +Requires: gimp-print-plugin +BuildRequires: gtk+-devel +BuildRequires: glib-devel Requires: /usr/bin/desktop-file-install -Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/v%{version}/%{name}-%{version}.tar.bz2 -Source1: gimp.desktop -Source2: gimp.png -Source3: filter-gimp-perl-requires.sh -Patch0: gimp-1.1.23-perlpath.patch -Patch1: gimp-1.2.1-libaa.patch -Patch2: gimp-1.2.3-newperl.patch.bz2 -Patch3: gimp-1.2.3-wget-fix.patch.bz2 +Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/v%{version}/%{name}-%{version}.tar.bz2 +Source1: gimp.desktop +Source2: gimp.png +Source3: filter-gimp-perl-requires.sh +Patch0: gimp-1.1.23-perlpath.patch +Patch3: gimp-1.2.3-wget-fix.patch.bz2 +Patch4: gimp-1.2.5-perl-plugin.patch %define __perl_requires %{SOURCE3} +%define debug_package %{nil} + +# gcc breaks with -g +# workaround for compiler bug on s390/s390x +%ifarch s390 s390x +%define optflags -O2 +%endif %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -53,7 +59,7 @@ before running the scripts. %package devel Summary: The GIMP plug-in and extension development kit. Group: Applications/Multimedia -Requires: gtk+-devel, gimp = %{version} +Requires: gtk+-devel, gimp = %{epoch}:%{version} %description devel The gimp-devel package contains the static libraries and header files for writing GNU Image Manipulation Program (GIMP) plug-ins and @@ -62,11 +68,11 @@ extensions. %package perl Summary: Perl extensions and plug-ins for the GIMP. Group: Applications/Multimedia -Requires: gimp = %{version} -Requires: perl +Requires: gimp = %{epoch}:%{version} +Requires: perl Provides: perl(Gimp::Util) Provides: perl(of) -BuildPreReq: perl-PDL Gtk-Perl perl +BuildPreReq: perl-PDL Gtk-Perl perl gimp-print-devel %description perl The gimp-perl package contains Perl extensions and plug-ins for the GIMP image manipulation program. @@ -74,9 +80,8 @@ GIMP image manipulation program. %prep %setup -q %patch0 -p1 -b .perlpath -%patch1 -p1 -b .libaa -%patch2 -p1 %patch3 -p1 +%patch4 -p1 %build #AUTOMAKE=automake-1.4 autoreconf @@ -86,12 +91,7 @@ else LIBAA="disable" CFLAGS="$RPM_OPT_FLAGS" %configure fi -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make -else - make -fi +make %{?smp_mflags} %install sed "s,\(=/\)\([a-z]\),=$RPM_BUILD_ROOT/\2,g" gimptool-1.2 > tmptool @@ -210,8 +210,6 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps # files we don't ship rm -f %{buildroot}%{_bindir}/escputil* \ %{buildroot}%{_mandir}/man1/escputil* \ - %{buildroot}%{_bindir}/gimp-remote* \ - %{buildroot}%{_mandir}/man1/gimp-remote* \ %{buildroot}%{_bindir}/embedxpm \ %{buildroot}%{_mandir}/man1/embedxpm* \ %{buildroot}%{_bindir}/scm2perl \ @@ -275,13 +273,14 @@ find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f %{_bindir}/gimp %{_bindir}/gimp-%{subver} +%{_bindir}/gimp-remote* %defattr (0644, root, root) %{_mandir}/man1/gimp.1* %{_mandir}/man1/gimp-%{subver}.1* %{_mandir}/man5/gimprc.5* %{_mandir}/man5/gimprc-%{subver}.5* - +%{_mandir}/man1/gimp-remote* %files devel %defattr (0755, root, root, 0755) @@ -310,6 +309,23 @@ find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f %{_mandir}/man3/* %changelog +* Wed Oct 15 2003 Matt Wilson 1:1.2.5-1 +- 1.2.5 (#101225) + +* Sun Jun 8 2003 Tim Powers 1:1.2.3-20.1 +- build for RHEL + +* Fri Jun 6 2003 Matt Wilson 1:1.2.3-20 +- add epoch to the version requirements of subpackages +- ship gimp-remote (#85344) + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jun 4 2003 Than Ngo 1:1.2.3-18 +- fix build problem with gcc 3.3 +- workaround for compiler bug on s390/s390x + * Wed Feb 19 2003 Tim Waugh 1:1.2.3-16 - Require gimp-print-plugin (bug #80437). @@ -347,7 +363,7 @@ find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f * Mon Aug 19 2002 Matt Wilson - fix up gimp-perl madness to work with 5.8.0 (#66610, #68782) - - added gimp-1.2.3-newperl.patch.bz2 from Mandrake's gimp package +- added gimp-1.2.3-newperl.patch.bz2 from Mandrake's gimp package - added gimp-1.2.3-wget-fix.patch.bz2 from Mandrake's gimp package - fix desktop file (#71021) diff --git a/sources b/sources index 9b24488..e5ce0bd 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -65c90518b954a24d46cdd931d8be550f gimp-1.2.3-newperl.patch.bz2 b528311805c993094b196ed3eb7c0cd1 gimp-1.2.3-wget-fix.patch.bz2 -b19235f19f524f772a4aef597a69b1da gimp-1.2.3.tar.bz2 +b83b55d80e6728268d56620ea4d3051a gimp-1.2.5.tar.bz2