Merge review:

- convert spec file to UTF-8
- remove unneeded gimp2, gimp-beta obsoletes
- quote macros in changelog
- use only spaces, not tabs
- make pyconsole.py plug-in executable (upstream bug #552601)
This commit is contained in:
Nils Philippsen 2008-09-17 08:36:34 +00:00
parent 726f9a2960
commit 56446b1ed1

View File

@ -51,13 +51,12 @@ Version: 2.4.7
%define age 0 %define age 0
%define minorver 400 %define minorver 400
%define microver %(ver=%{version}; echo ${ver##*.*.}) %define microver %(ver=%{version}; echo ${ver##*.*.})
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 2 Epoch: 2
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.gimp.org/ URL: http://www.gimp.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n) BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%__id_u -n)
Obsoletes: gimp2 gimp-beta <= %{?epoch:%{epoch}:}2.4
Obsoletes: gimp-perl < 2:2.0 Obsoletes: gimp-perl < 2:2.0
BuildRequires: alsa-lib-devel >= 1.0.0 BuildRequires: alsa-lib-devel >= 1.0.0
BuildRequires: curl-devel >= 7.15.1 BuildRequires: curl-devel >= 7.15.1
@ -153,7 +152,6 @@ Requires: gimp-libs-%{_arch} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: gtk2-devel Requires: gtk2-devel
Requires: glib2-devel Requires: glib2-devel
Requires: pkgconfig Requires: pkgconfig
Obsoletes: gimp2-devel gimp-beta-devel <= %{?epoch:%{epoch}:}2.4
%description devel %description devel
The gimp-devel package contains the static libraries and header files The gimp-devel package contains the static libraries and header files
@ -300,6 +298,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/gimp/plugins.d
mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_sbindir}
install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr install -m 0755 gimp-plugin-mgr %{buildroot}%{_sbindir}/gimp-plugin-mgr
# make pyconsole.py executable, gimp/gnome bug #552601
chmod 755 %{buildroot}%{_libdir}/gimp/%{interfacever}/plug-ins/pyconsole.py
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
@ -456,6 +457,14 @@ fi
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%changelog %changelog
* Wed Sep 17 2008 Nils Philippsen <nils@redhat.com> - 2:2.4.7-2
- Merge review:
- convert spec file to UTF-8
- remove unneeded gimp2, gimp-beta obsoletes
- quote macros in changelog
- use only spaces, not tabs
- make pyconsole.py plug-in executable (upstream bug #552601)
* Fri Aug 22 2008 Nils Philippsen <nphilipp@redhat.com> - 2:2.4.7-1 * Fri Aug 22 2008 Nils Philippsen <nphilipp@redhat.com> - 2:2.4.7-1
- version 2.4.7 - version 2.4.7
@ -1189,7 +1198,7 @@ fi
* Mon Apr 2 2001 Preston Brown <pbrown@redhat.com> * Mon Apr 2 2001 Preston Brown <pbrown@redhat.com>
- some gimp-perl files weren't defattr'd (#34325) - some gimp-perl files weren't defattr'd (#34325)
* Fri Mar 30 2001 Trond Eivind Glomsrød <teg@redhat.com> * Fri Mar 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
- Don't include embedxpm, as it depends on a non-included perl module (#=33249) - Don't include embedxpm, as it depends on a non-included perl module (#=33249)
- move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp - move gimpdoc and xcftopnm to gimp-perl, as they are dependant on the perl Gimp
module module
@ -1279,6 +1288,4 @@ fi
* Wed Dec 22 1999 Gregory McLean <gregm@comstar.net> * Wed Dec 22 1999 Gregory McLean <gregm@comstar.net>
- Version 1.1.14 - Version 1.1.14
- Added some auto %files section generation scriptlets - Added some auto %%files section generation scriptlets