rpms/gimp/devel gimp.spec,1.179,1.180
Nils Philippsen
nphilipp at fedoraproject.org
Wed Jan 7 10:00:08 UTC 2009
Author: nphilipp
Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7797
Modified Files:
gimp.spec
Log Message:
split off gimptool into new gimp-devel-tools subpackage to avoid multilib conflicts (#477789)
require poppler-glib-devel for building from F9 on (#478691)
fix gimp-devel package group
Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- gimp.spec 4 Jan 2009 12:17:48 -0000 1.179
+++ gimp.spec 7 Jan 2009 09:59:37 -0000 1.180
@@ -29,7 +29,7 @@
%define age 0
%define minorver 600
%define microver %(ver=%{version}; echo ${ver##*.*.})
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 2
License: GPLv2+
Group: Applications/Multimedia
@@ -62,7 +62,11 @@
BuildRequires: libtiff-devel
BuildRequires: libwmf-devel >= 0.2.8
BuildRequires: pango-devel >= 1.18.0
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 8 || 0%{?rhel} > 5
+BuildRequires: poppler-glib-devel >= 0.4.1
+%else
BuildRequires: poppler-devel >= 0.4.1
+%endif
BuildRequires: python-devel
BuildRequires: pygtk2-devel >= 2.10.4
BuildRequires: pygobject2-devel
@@ -125,9 +129,10 @@
%package devel
Summary: GIMP plugin and extension development kit
-Group: Applications/Multimedia
+Group: Development/Libraries
License: LGPLv2+
Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: gimp-devel-tools = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: gtk2-devel
Requires: glib2-devel
Requires: pkgconfig
@@ -137,6 +142,16 @@
for writing GNU Image Manipulation Program (GIMP) plug-ins and
extensions.
+%package devel-tools
+Summary: GIMP plugin and extension development tools
+Group: Development/Tools
+License: LGPLv2+
+Requires: gimp-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel-tools
+The gimp-devel-tools package contains gimptool, a helper program to build GNU
+Image Manipulation Program (GIMP) plug-ins and extensions.
+
%package help-browser
Summary: GIMP help browser plug-in
Group: Applications/Multimedia
@@ -421,14 +436,6 @@
%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}
@@ -441,11 +448,27 @@
%{_includedir}/gimp-%{interfacever}
%{_libdir}/pkgconfig/*
+%files devel-tools
+%defattr (-, root, root, 0755)
+%{_bindir}/gimptool-%{interfacever}
+%{_mandir}/man1/gimptool-%{interfacever}.1*
+
+%if %{with convenience}
+%{_bindir}/gimptool
+%{_mandir}/man1/gimptool.1*
+%endif
+
%files help-browser
%defattr (-, root, root, 0755)
%{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
%changelog
+* Wed Jan 07 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-3
+- split off gimptool into new gimp-devel-tools subpackage to avoid multilib
+ conflicts (#477789)
+- require poppler-glib-devel for building from F9 on (#478691)
+- fix gimp-devel package group
+
* Sun Jan 04 2009 Nils Philippsen <nils at redhat.com> - 2:2.6.4-2
- enable building with aalib
More information about the fedora-extras-commits
mailing list