From de17517e72107449a50a10f720360836c7c032f5 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:12:57 +0000 Subject: [PATCH] auto-import changelog data from gimp-1.2.3-16.src.rpm 1.2.3-16 - Require gimp-print-plugin (bug #80437). Wed Jan 22 2003 Tim Powers - rebuilt 3-14 - use internal dep generator. 3-13 - don't use rpms internal dep generator 1.23-12 - rebuild to pick up some plug-ins - add some BuildPreReq's on some perl packages for the gimp-perl package Tue Nov 05 2002 Tim Waugh 1.2.3-11 - Don't ship the print plug-in. This comes from gimp-print instead. Tue Nov 05 2002 Tim Waugh 1.2.3-10 - Use %{_libdir}. - Don't use previously-installed gimptool when building. - Build requires glib-devel. - Don't install files not shipped. - Clean up doc files in manifest. - Ship more translations. - Ship xcftopnm man page, and gimp-perl man pages. --- gimp.spec | 74 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 10 deletions(-) diff --git a/gimp.spec b/gimp.spec index b6d933e..71f9edf 100644 --- a/gimp.spec +++ b/gimp.spec @@ -5,7 +5,7 @@ Summary: The GNU Image Manipulation Program. Name: gimp Version: %{subver}.%{microver} -Release: 9 +Release: 16 Epoch: 1 Copyright: GPL, LGPL Group: Applications/Multimedia @@ -14,7 +14,9 @@ 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 @@ -25,7 +27,7 @@ Patch1: gimp-1.2.1-libaa.patch Patch2: gimp-1.2.3-newperl.patch.bz2 Patch3: gimp-1.2.3-wget-fix.patch.bz2 -%define __find_requires %{SOURCE3} +%define __perl_requires %{SOURCE3} %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -64,7 +66,7 @@ Requires: gimp = %{version} Requires: perl Provides: perl(Gimp::Util) Provides: perl(of) - +BuildPreReq: perl-PDL Gtk-Perl perl %description perl The gimp-perl package contains Perl extensions and plug-ins for the GIMP image manipulation program. @@ -97,7 +99,10 @@ chmod 755 tmptool [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT rootdir=`pwd` pushd plug-ins/perl -perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /dev/null +PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor GIMPTOOL=$rootdir/tmptool \ +CFLAGS=-I$(cd ../..;pwd) LDFLAGS=-L$(cd ../../libgimp/.libs;pwd) \ + perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor \ + --disable-gimptest < /dev/null perl -pi -e "s!-Wl,-rpath,$installarchlib/CORE!!g" Makefile for I in `find -name Makefile`; do sed "s,/usr/bin/gimptool,$rootdir/tmptool,g" $I > $I- @@ -140,13 +145,16 @@ fi # This perl madness will drive me batty # eval perl '-V:archname' -find $RPM_BUILD_ROOT/%{_prefix}/lib/perl5 -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v perllocal.pod > gimp-perl +find $RPM_BUILD_ROOT/%{_libdir}/perl5 -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v perllocal.pod > gimp-perl + +# Don't ship the print plug-in, but instead get it from gimp-print. +rm -f %{buildroot}%{_libdir}/gimp/*/plug-ins/print # # Plugins and modules change often (grab the executeable ones) # echo "%defattr (0755, root, root)" > gimp-plugin-files -find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v /usr/lib/gimp/%{subver}/modules/.*\.a$ | grep -v /usr/lib/gimp/%{subver}/modules/.*\.la$ >>gimp-plugin-files +find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v %{_libdir}/gimp/%{subver}/modules/.*\.a$ | grep -v %{_libdir}/gimp/%{subver}/modules/.*\.la$ >>gimp-plugin-files # # Now pull the perl ones out. @@ -162,7 +170,10 @@ if [ -f /usr/lib/rpm/find-lang.sh ] ; then /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-std-plugins /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-script-fu - cat %{name}.lang gimp-std-plugins.lang gimp-script-fu.lang > gimp-all.lang + /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-perl + /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-libgimp + cat %{name}.lang gimp-std-plugins.lang gimp-script-fu.lang \ + gimp-libgimp.lang > gimp-all.lang fi # @@ -181,6 +192,7 @@ done cat gimp-plugin-files gimp-all.lang gimp-tips-files > gimp.files echo "%defattr (555, root, root, 555)" > gimp-perl-files cat gimp-perl gimp-perl-plugin-files >> gimp-perl-files +cat gimp-perl.lang >> gimp-perl-files # install desktop entry mkdir -p %{buildroot}/%{_datadir}/applications @@ -195,6 +207,20 @@ install -m 644 $RPM_SOURCE_DIR/gimp.desktop %{buildroot}/%{_datadir}/mc/template mkdir -p %{buildroot}/usr/share/pixmaps 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 \ + %{buildroot}%{_mandir}/man1/scm2perl* \ + %{buildroot}%{_bindir}/scm2scm \ + %{buildroot}%{_mandir}/man1/scm2scm* +rm -rf %{buildroot}%{_datadir}/gimp/*/devel-docs +find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f + %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -205,7 +231,7 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %files -f gimp.files %defattr (0644, root, root, 0755) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO -%doc docs/*.txt docs/*.eps ABOUT-NLS README.i18n README.perl README.win32 TODO +%doc docs/*.txt docs/*.ps ABOUT-NLS README.i18n README.perl README.win32 TODO %attr(-,root,root) %config(missingok) /%{_datadir}/applications/*.desktop %attr(-,root,root) %config(missingok) /%{_datadir}/mc/templates/gimp.desktop %{_datadir}/pixmaps/gimp.png @@ -249,8 +275,6 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %{_bindir}/gimp %{_bindir}/gimp-%{subver} -#{_bindir}/embedxpm -#%{_bindir}/escputil %defattr (0644, root, root) %{_mandir}/man1/gimp.1* @@ -282,8 +306,38 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %defattr (0755, root, root, 0755) %{_bindir}/gimpdoc %{_bindir}/xcftopnm +%{_mandir}/man1/xcftopnm* +%{_mandir}/man3/* %changelog +* Wed Feb 19 2003 Tim Waugh 1:1.2.3-16 +- Require gimp-print-plugin (bug #80437). + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Sat Jan 4 2003 Jeff Johnson 1:3-14 +- use internal dep generator. + +* Sat Dec 14 2002 Tim Powers 1:3-13 +- don't use rpms internal dep generator + +* Mon Dec 9 2002 Tim Powers 1:1.23-12 +- rebuild to pick up some plug-ins +- add some BuildPreReq's on some perl packages for the gimp-perl package + +* Tue Nov 5 2002 Tim Waugh 1.2.3-11 +- Don't ship the print plug-in. This comes from gimp-print instead. + +* Tue Nov 5 2002 Tim Waugh 1.2.3-10 +- Use %%{_libdir}. +- Don't use previously-installed gimptool when building. +- Build requires glib-devel. +- Don't install files not shipped. +- Clean up doc files in manifest. +- Ship more translations. +- Ship xcftopnm man page, and gimp-perl man pages. + * Fri Aug 30 2002 Tim Powers - filter out gimp-perl dep on perl(PDL::LiteF)