move gimptool to devel subpackage make gimp-plugin-mgr not require

gimptool/pkg-config (#465869)
This commit is contained in:
Nils Philippsen 2008-10-07 14:31:50 +00:00
parent 5985afbdf7
commit b2d5993257
2 changed files with 15 additions and 8 deletions

View File

@ -2,8 +2,7 @@
shopt -s nullglob
GIMPTOOL="@GIMPTOOL@"
GIMPPLUGINDIR="`"$GIMPTOOL" --gimpplugindir`"
GIMPPLUGINDIR="@GIMPPLUGINDIR@"
EXITVAL=0
showhelp () {

View File

@ -31,7 +31,7 @@ Version: 2.6.0
%define age 0
%define minorver 600
%define microver %(ver=%{version}; echo ${ver##*.*.})
Release: 1%{?dist}
Release: 2%{?dist}
Epoch: 2
License: GPLv2+
Group: Applications/Multimedia
@ -209,7 +209,7 @@ fi
make %{?_smp_mflags}
# convenience stuff for external plugins (e.g. xsane)
sed -e 's|@GIMPTOOL@|%{_bindir}/gimptool-%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
sed -e 's|@GIMPPLUGINDIR@|%{_libdir}/gimp/%{interfacever}|g' < %{SOURCE1} > gimp-plugin-mgr
%install
rm -rf %{buildroot}
@ -359,27 +359,23 @@ fi
%{_bindir}/gimp-%{binver}
%{_bindir}/gimp-remote-%{binver}
%{_bindir}/gimptool-%{interfacever}
%{_bindir}/gimp-console-%{binver}
%{_sbindir}/gimp-plugin-mgr
%if %{with convenience}
%{_bindir}/gimp
%{_bindir}/gimp-remote
%{_bindir}/gimptool
%{_bindir}/gimp-console
%endif
%{_mandir}/man1/gimp-%{binver}.1*
%{_mandir}/man1/gimp-remote-%{binver}.1*
%{_mandir}/man1/gimptool-%{interfacever}.1*
%{_mandir}/man1/gimp-console-%{binver}.1*
%{_mandir}/man5/gimprc-%{binver}.5*
%if %{with convenience}
%{_mandir}/man1/gimp.1*
%{_mandir}/man1/gimp-remote.1*
%{_mandir}/man1/gimptool.1*
%{_mandir}/man1/gimp-console.1*
%{_mandir}/man5/gimprc.5*
%endif
@ -417,6 +413,14 @@ fi
%doc HACKING README.i18n
%doc %{_datadir}/gtk-doc/*
%{_bindir}/gimptool-%{interfacever}
%{_mandir}/man1/gimptool-%{interfacever}.1*
%if %{with convenience}
%{_bindir}/gimptool
%{_mandir}/man1/gimptool.1*
%endif
%{_libdir}/*.so
%dir %{_libdir}/gimp
%dir %{_libdir}/gimp/%{interfacever}
@ -430,6 +434,10 @@ fi
%{_libdir}/pkgconfig/*
%changelog
* Tue Oct 07 2008 Nils Philippsen <nils@redhat.com> - 2:2.6.0-2
- move gimptool to devel subpackage
- make gimp-plugin-mgr not require gimptool/pkg-config (#465869)
* Thu Oct 02 2008 Nils Philippsen <nils@redhat.com> - 2:2.6.0-1
- version 2.6.0
- remove obsolete htmlview patch