From 51a48ad7c7f2a1cdb4b5d7d91e25093c7fce6828 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:11:56 +0000 Subject: [PATCH] auto-import changelog data from gimp-1.2.3-8.src.rpm Fri Aug 30 2002 Matt Wilson - use desktop-file-install - nuke rpath in perl plugin --- gimp.spec | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gimp.spec b/gimp.spec index 0c28864..47f0ade 100644 --- a/gimp.spec +++ b/gimp.spec @@ -5,7 +5,7 @@ Summary: The GNU Image Manipulation Program. Name: gimp Version: %{subver}.%{microver} -Release: 7 +Release: 8 Epoch: 1 Copyright: GPL, LGPL Group: Applications/Multimedia @@ -15,6 +15,7 @@ Obsoletes: gimp-data-min Obsoletes: gimp-libgimp Requires: gtk+ >= 1.2.0 BuildRequires: gtk+-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 @@ -94,6 +95,7 @@ chmod 755 tmptool rootdir=`pwd` pushd plug-ins/perl perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor < /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- mv $I- $I @@ -180,7 +182,12 @@ cat gimp-perl gimp-perl-plugin-files >> gimp-perl-files # install desktop entry mkdir -p %{buildroot}/%{_datadir}/applications mkdir -p %{buildroot}/%{_datadir}/mc/templates -install -m 644 $RPM_SOURCE_DIR/gimp.desktop %{buildroot}/%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +desktop-file-install \ + --vendor gnome \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;Graphics;X-Red-Hat-Base" \ + $RPM_SOURCE_DIR/gimp.desktop install -m 644 $RPM_SOURCE_DIR/gimp.desktop %{buildroot}/%{_datadir}/mc/templates mkdir -p %{buildroot}/usr/share/pixmaps install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps @@ -196,7 +203,7 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %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 -%attr(-,root,root) %config(missingok) /%{_datadir}/applications/gimp.desktop +%attr(-,root,root) %config(missingok) /%{_datadir}/applications/*.desktop %attr(-,root,root) %config(missingok) /%{_datadir}/mc/templates/gimp.desktop %{_datadir}/pixmaps/gimp.png @@ -274,6 +281,10 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %{_bindir}/xcftopnm %changelog +* Fri Aug 30 2002 Matt Wilson +- use desktop-file-install +- nuke rpath in perl plugin + * 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