diff --git a/gimp.spec b/gimp.spec index 1228285..9b08eaa 100644 --- a/gimp.spec +++ b/gimp.spec @@ -27,7 +27,7 @@ # # -Summary: The GNU Image Manipulation Program +Summary: GNU Image Manipulation Program Name: gimp Version: 2.2.12 %define binver 2.2 @@ -36,8 +36,7 @@ Version: 2.2.12 %define age 0 %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) -#define prever pre2 -Release: %{?prever:0.0.%{prever}.}1.1%{?dist} +Release: 2%{?dist} Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -86,13 +85,11 @@ Requires: gtk2 >= 2.4.14 Requires: pango >= 1.6.0 Requires: fontconfig >= 2.2.0 Requires: gimp-print >= 4.2.0 -Requires(post): /sbin/ldconfig Requires(post): /usr/bin/update-desktop-database Requires(post): hicolor-icon-theme -Requires(postun): /sbin/ldconfig Requires(postun): /usr/bin/update-desktop-database Requires(postun): hicolor-icon-theme -Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/%{?prever:testing/}gimp-%{version}%{?prever:-%{prever}}.tar.bz2 +Source0: ftp://ftp.gimp.org/pub/gimp/v%{binver}/gimp-%{version}.tar.bz2 Patch0: gimp-2.0pre3-buildroot.patch Patch1: gimp-2.0.1-gimphelpmissing.patch Patch2: gimp-2.2.3-icontheme.patch @@ -101,23 +98,31 @@ Patch5: gimp-2.2.11-htmlview.patch Patch6: gimp-2.2.11-gimptool.patch %description -The GIMP (GNU Image Manipulation Program) is a powerful image -composition and editing program, which can be extremely useful for -creating logos and other graphics for webpages. The GIMP has many of -the tools and filters you would expect to find in similar commercial -offerings, and some interesting extras as well. The GIMP provides a -large image manipulation toolbox, including channel operations and -layers, effects, sub-pixel imaging and anti-aliasing, and conversions, -all with multi-level undo. +GIMP (GNU Image Manipulation Program) is a powerful image composition and +editing program, which can be extremely useful for creating logos and other +graphics for webpages. GIMP has many of the tools and filters you would expect +to find in similar commercial offerings, and some interesting extras as well. +GIMP provides a large image manipulation toolbox, including channel operations +and layers, effects, sub-pixel imaging and anti-aliasing, and conversions, all +with multi-level undo. + +%package libs +Summary: GIMP libraries +Group: System Environment/Libraries + +%description libs +The gimp-libs package contains shared libraries needed for the GNU Image +Manipulation Program (GIMP). %package devel -Summary: GIMP plugin and extension development kit +Summary: GIMP plugin and extension development kit Group: Applications/Multimedia -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: gtk2-devel Requires: glib2-devel Requires: pkgconfig Obsoletes: gimp2-devel gimp-beta-devel <= %{version} + %description devel The gimp-devel package contains the static libraries and header files for writing GNU Image Manipulation Program (GIMP) plug-ins and @@ -138,7 +143,7 @@ include convenience symlinks: %_enable_convenience EOF -%setup -q -n gimp-%{version}%{?prever:-%{prever}} +%setup -q -n gimp-%{version} %patch0 -p1 -b .buildroot %patch1 -p1 -b .gimphelpmissing %patch2 -p1 -b .icontheme @@ -249,7 +254,6 @@ ln -snf gimptool-%{interfacever}.1 %{buildroot}/%{_mandir}/man1/gimptool.1 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig /usr/bin/update-desktop-database %{_datadir}/applications if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then %{_sbindir}/xsane-install-gimp-plugin --install %{interfacever} @@ -266,7 +270,6 @@ if [ -x %{_sbindir}/xsane-install-gimp-plugin ]; then fi %postun -/sbin/ldconfig if [ "$1" = "0" ]; then /usr/bin/update-desktop-database %{_datadir}/applications fi @@ -275,6 +278,9 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %files -f gimp.files %defattr(-, root, root, 0755) %doc AUTHORS COPYING ChangeLog NEWS README @@ -326,29 +332,6 @@ fi #%{_datadir}/locale/*/*/* -#%{_libdir}/libgck-%{interfacever}.so.%{age}.%{minorver}.%{microver} -#%{_libdir}/libgck-%{interfacever}.so.%{age} -%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimp-%{interfacever}.so.%{age} -%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpbase-%{interfacever}.so.%{age} -%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpcolor-%{interfacever}.so.%{age} -%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpmath-%{interfacever}.so.%{age} -%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpmodule-%{interfacever}.so.%{age} -%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpthumb-%{interfacever}.so.%{age} -%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpui-%{interfacever}.so.%{age} -%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver} -%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age} -#%{_libdir}/libgimpproxy-%{interfacever}.so.%{age}.%{minorver}.%{microver} -#%{_libdir}/libgimpproxy-%{interfacever}.so.%{age} -#%{_libdir}/libgimptool-%{interfacever}.so.%{age}.%{minorver}.%{microver} -#%{_libdir}/libgimptool-%{interfacever}.so.%{age} - %{_bindir}/gimp-%{binver} %{_bindir}/gimp-remote-%{binver} %{_bindir}/gimptool-%{interfacever} @@ -375,6 +358,25 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gimp.png +%files libs +%defattr(-, root, root, 0755) +%{_libdir}/libgimp-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimp-%{interfacever}.so.%{age} +%{_libdir}/libgimpbase-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpbase-%{interfacever}.so.%{age} +%{_libdir}/libgimpcolor-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpcolor-%{interfacever}.so.%{age} +%{_libdir}/libgimpmath-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpmath-%{interfacever}.so.%{age} +%{_libdir}/libgimpmodule-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpmodule-%{interfacever}.so.%{age} +%{_libdir}/libgimpthumb-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpthumb-%{interfacever}.so.%{age} +%{_libdir}/libgimpui-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpui-%{interfacever}.so.%{age} +%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpwidgets-%{interfacever}.so.%{age} + %files devel %defattr (-, root, root, 0755) %doc HACKING @@ -392,6 +394,10 @@ fi %{_libdir}/pkgconfig/* %changelog +* Tue Jul 18 2006 Nils Philippsen - 2:2.2.12-2 +- split off libraries into gimp-libs to allow multilib installations +- remove pre-release cruft + * Wed Jul 12 2006 Jesse Keating - 2:2.2.12-1.1 - rebuild