- updated perldep patch: don't skip perl(XSLoader) but skip xmps

- release 2

Changed files:
    gimp-perldep.patch -> 1.3
    gimp.spec -> 1.101

diff --git a/gimp-perldep.patch b/gimp-perldep.patch
index a941a19f77446b1b25326284cfb81000e7583c50..81de452f9deed6f4093cb024772f98b55276199a 100644 (file)
--- a/gimp-perldep.patch
+++ b/gimp-perldep.patch
@@ -33,8 +33,8 @@
  perl(1), L<Gimp>, L<Gimp::UI>, L<Gtk>.
  
 +=cut
---- gimp-1.1.15.pius/find-perl-requires        Thu Jan  1 01:00:00 1970
-+++ gimp-1.1.15/find-perl-requires     Sun Jan 16 22:37:56 2000
+--- gimp-1.2.1.orig/find-perl-requires Thu Jan  1 01:00:00 1970
++++ gimp-1.2.1/find-perl-requires      Sun Jan 16 22:37:56 2000
 @@ -0,0 +1,13 @@
 +#!/bin/sh
 +ulimit -c 0
@@ -42,10 +42,10 @@
 +filelist=`sed "s/['\"]/\\\&/g"`
 +
 +requires="`echo $filelist|/usr/lib/rpm/find-requires`"
-+# the XSLoader module comes with perl => 5.005_63
-+# and we still use the 5.005_03 one, so just skip it now...
-+requires_perl="`/usr/lib/rpm/perl.req $filelist|grep -v 'perl(XSLoader)'`"
-+requires_mod="`rpm -q --whatprovides --qf "%{NAME}\n"  $requires_perl 2>/dev/null`"
++requires_perl="`/usr/lib/rpm/perl.req $filelist`"
++requires_mod="`LC_ALL=C rpm -q --whatprovides --qf "%{NAME}\n"  $requires_perl 2>/dev/null`"
++# "libmpeg.so" is provided by mpeg_lib and xmps - the first is proper one,
++# so skip xmps here
 +echo "$requires
 +$requires_perl
-+$requires_mod"|  sort -u
++$requires_mod"| grep -v "no package provides" | grep -v "^xmps$" | sort -u

diff --git a/gimp.spec b/gimp.spec
index 0bebf767d171a1f0849435780b4ec1bfd0be625c..725f455314f207fe80b2237158587ade1f1f6305 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,5 +1,5 @@
 %include       /usr/lib/rpm/macros.perl
-%define                __find_requires %{_builddir}/gimp-%{version}/find-perl-requires
+%define                __find_requires %{_builddir}/gimp-%{version}/find-perl-requires
 Summary:       The GNU Image Manipulation Program
 Summary(fr):   Le programme de manipulation d'images de GNU
 Summary(de):   Das GNU-Bildbearbeitungs-Programm
@@ -7,7 +7,7 @@ Summary(pl):    GNU program do manipulacji formatami graficznymi (GIMP)
 Summary(tr):   Çizim, boyama ve görüntü iþleme programý
 Name:          gimp
 Version:       1.2.1
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Graphics
@@ -116,6 +116,7 @@ Biblioteki statyczne do GIMPa.
 %package aa
 Summary:       ASCII Art plugin for Gimp
 Summary(fr):   Plugin d'art ASCII pour Gimp
+Summary(pl):   Wsparcie dla ASCII Art do Gimpa
 Group:         X11/Applications/Graphics
 Group(fr):     X11/Applications/Graphismes
 Group(pl):     X11/Aplikacje/Grafika
@@ -129,6 +130,9 @@ shared library.
 Ce paquet contient le plugin d'art ASCII qui nécéssite la librairie
 partagée aalib.
 
+%description aa -l pl
+Ten pakiet zawiera "wtyczkê" do Gimpa ze wsparciem dla ASCII Art.
+
 %package xd
 Summary:       Xdelta plugin for GIMP
 Summary(fr):   Plugin Xdelta pour GIMP