- shortened perldep patch, use %%_noautoreq{,dep} macros instead

- use %%rpmcflags macro
- use %%_pixmapsdir instead of /usr/X11R6/share/icons
- moved *.la to devel, resolved conflict (gimptool) between base and devel
- release 4

Changed files:
    gimp-perldep.patch -> 1.4
    gimp.spec -> 1.104

diff --git a/gimp-perldep.patch b/gimp-perldep.patch
index 81de452f9deed6f4093cb024772f98b55276199a..a2f92da181f76c235a09a063304471e85faa6e6c 100644 (file)
--- a/gimp-perldep.patch
+++ b/gimp-perldep.patch
@@ -1,16 +1,3 @@
---- gimp-1.1.13/plug-ins/perl/examples/logulator.dep   Tue Nov 23 20:24:16 1999
-+++ gimp-1.1.13/plug-ins/perl/examples/logulator       Sun Dec  5 01:40:58 1999
-@@ -44,8 +44,8 @@
- 
- The drawable must have an alpha channel, and the shape of this channel
- prescribes the shape of the logo. Most logos ignore any colour information
--and instead use the shape only as a stencil, but some logo scripts do make
--use of the text colour.
-+and instead use the shape only as a stencil, but some logo scripts do 
-+make use of the text colour.
- 
- The original help for $1 follows:
- 
 --- gimp-1.1.13/plug-ins/perl/Gimp/Module.pm.dep       Fri Nov 19 23:21:31 1999
 +++ gimp-1.1.13/plug-ins/perl/Gimp/Module.pm   Sun Dec  5 01:44:45 1999
 @@ -55,3 +55,5 @@
@@ -33,19 +20,3 @@
  perl(1), L<Gimp>, L<Gimp::UI>, L<Gtk>.
  
 +=cut
---- 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
-+
-+filelist=`sed "s/['\"]/\\\&/g"`
-+
-+requires="`echo $filelist|/usr/lib/rpm/find-requires`"
-+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"| grep -v "no package provides" | grep -v "^xmps$" | sort -u

diff --git a/gimp.spec b/gimp.spec
index 4c3ccf11a6a047334db45a06220e694646f621c3..8bd74a00fd0557d2ad6834af96933e0ba6217948 100644 (file)
--- a/gimp.spec
+++ b/gimp.spec
@@ -1,13 +1,12 @@
 %include       /usr/lib/rpm/macros.perl
-%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
-Summary(pl):   GNU program do manipulacji formatami graficznymi (GIMP)
+Summary(pl):   Program GNU do manipulacji formatami graficznymi (GIMP)
 Summary(tr):   Çizim, boyama ve görüntü iþleme programý
 Name:          gimp
 Version:       1.2.1
-Release:       3
+Release:       4
 Epoch:         1
 License:       GPL
 Group:         X11/Applications/Graphics
@@ -40,6 +39,7 @@ BuildRequires:        rpm-perlprov
 %requires_eq   perl
 Requires:      %{perl_sitearch}
 Requires:      gtk+ >= 1.2.8-3
+Requires:      mpeg_lib
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     gimp-data-min
 Obsoletes:     gimp-libgimp
@@ -47,6 +47,11 @@ Obsoletes:   gimp-libgimp
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 
+# need libmpeg.so from mpeg_lib (xmps has other libmpeg.so)
+%define                _noautoreqdep   libmpeg.so
+# workaround for find-perl-requires
+%define                _noautoreq      "perl(of)"
+
 %description
 The GIMP is an image manipulation program suitable for photo
 retouching, image composition and image authoring. Many people find it
@@ -84,7 +89,7 @@ stron WWW, przerobi
 Summary:       GIMP plugin and extension development kit
 Summary(fr):   Plugin GIMP et kit de développement d'extensions
 Summary(de):   GIMP-Plugin und Extension Development Kit
-Summary(pl):   Dodatkowe moduly i rozszerzenia dla Gimp
+Summary(pl):   Pliki do budowania modu³ów i rozszerzeñ dla Gimp
 Summary(tr):   GIMP plugin ve uzantý geliþtirme araçlarý
 Group:         X11/Applications/Graphics
 Group(pl):     X11/Aplikacje/Grafika
@@ -156,10 +161,8 @@ partag
 %patch2 -p1
 %patch3 -p1
 
-chmod +x find-perl-requires
-
 %build
-CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} -DPERL_POLLUTE"
+CFLAGS="%{rpmcflags} -DPERL_POLLUTE"
 %configure \
        --without-included-gettext \
        --without-xdelta \
@@ -172,15 +175,14 @@ CFLAGS="%{?debug:-O0 -g}%{!?debug:$RPM_OPT_FLAGS} -DPERL_POLLUTE"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/icons \
+install -d $RPM_BUILD_ROOT%{_pixmapsdir} \
        $RPM_BUILD_ROOT%{_applnkdir}/Graphics
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        m4datadir=%{_aclocaldir}
 
-install pixmaps/*.xpm $RPM_BUILD_ROOT%{_datadir}/icons/
-install plug-ins/*/*.xpm $RPM_BUILD_ROOT%{_datadir}/icons/
+install pixmaps/*.xpm plug-ins/*/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Graphics
 mv $RPM_BUILD_ROOT/usr/bin/* $RPM_BUILD_ROOT%{_bindir}
@@ -211,7 +213,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/*.gz docs/*README
 %doc docs/quick_reference.*
 
-%attr(755,root,root) %{_bindir}/gimp* 
+%attr(755,root,root) %{_bindir}/gimp 
+%attr(755,root,root) %{_bindir}/gimp-remote 
+%attr(755,root,root) %{_bindir}/gimpdoc
 %{_applnkdir}/Graphics/gimp.desktop
 
 %{_mandir}/man1/gimp.1* 
@@ -222,8 +226,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/gimp/1.2
 %dir %{_libdir}/gimp/1.2/plug-ins
 %dir %{_libdir}/gimp/1.2/modules
-%attr(755,root,root) %{_libdir}/gimp/1.2/modules/*la
-%attr(755,root,root) %{_libdir}/gimp/1.2/modules/*so
+%attr(755,root,root) %{_libdir}/gimp/1.2/modules/*.so
 
 %dir %{_datadir}/gimp
 %dir %{_datadir}/gimp/1.2
@@ -260,7 +263,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %attr(755,root,root) %{_datadir}/gimp/1.2/user_install
 
-%{_datadir}/icons/*.xpm 
+%{_pixmapsdir}/*.xpm 
 
 ## perl stuff
 %{perl_sitearch}/Gimp
@@ -282,8 +285,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc devel-docs/libgimp/html/*
 %attr(755,root,root) %{_bindir}/gimptool
+%attr(755,root,root) %{_bindir}/gimp-config
 %attr(755,root,root) %{_libdir}/lib*.so 
 %{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/gimp/1.2/modules/*.la
 
 %{_includedir}/gck 
 %{_includedir}/libgimp