From 5cabd2afa62ed9930f6b1c1ae7fe1a094f1c8079 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:18:40 +0000 Subject: [PATCH] auto-import changelog data from gimp-2.0.3-1.src.rpm Thu Jul 22 2004 Nils Philippsen - version 2.0.3 - buildreq gtk2-devel >= 2.4.0 - use -32 or -64 postfixed binaries if available Fri Jul 02 2004 Nils Philippsen - use included desktop (#126723), application-registry, mime-info and icon files - remove perl cruft (Gimp-Perl is an external package now) - further spec file cleaning --- .cvsignore | 2 +- gimp.spec | 130 +++++++++++++++++++---------------------------------- sources | 2 +- 3 files changed, 47 insertions(+), 87 deletions(-) diff --git a/.cvsignore b/.cvsignore index b377372..bcdf9a6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gimp-2.0.2.tar.bz2 +gimp-2.0.3.tar.bz2 diff --git a/gimp.spec b/gimp.spec index 0cd51c9..b17530b 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,4 +1,3 @@ -%define _enable_perl %{?enable_perl:%{enable_perl}}%{?!enable_perl:0} %define _enable_python %{?enable_python:%{enable_python}}%{?!enable_python:1} %define _enable_mp %{?enable_mp:%{enable_mp}}%{?!enable_mp:1} %define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1} @@ -8,29 +7,27 @@ %define subver 2.0 %define age 0 %define minorver 0 -%define microver 2 +%define microver 3 %define prever 0 %define gimp_lang_ver 20 Summary: The GNU Image Manipulation Program Name: gimp -Version: 2.0.2 +Version: 2.0.3 %if %prever Release: 0.%{prever}.1 %else -Release: 3 +Release: 1 %endif Epoch: 1 License: GPL, LGPL Group: Applications/Multimedia URL: http://www.gimp.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -# Obsoletes: gimp-data-min -# Obsoletes: gimp-libgimp Obsoletes: gimp2 gimp-beta <= %{version} Obsoletes: gimp-perl < %{epoch}:%{version} BuildRequires: glib2-devel >= 2.3.0 -BuildRequires: gtk2-devel >= 2.3.0 +BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: pango-devel >= 1.4.0 BuildRequires: fontconfig-devel >= 2.2.0 BuildRequires: gtkhtml2-devel @@ -58,8 +55,6 @@ Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/testing/gimp-%{version}%{prever %else Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/gimp-%{version}.tar.bz2 %endif -Source1: gimp.desktop -Source2: gimp.png Patch0: gimp-2.0pre3-buildroot.patch Patch1: gimp-2.0.1-gimphelpmissing.patch @@ -94,18 +89,6 @@ The gimp-devel package contains the static libraries and header files for writing GNU Image Manipulation Program (GIMP) plug-ins and extensions. -%if %_enable_perl -%package perl -Summary: GIMP perl extensions and plugins. -Group: Applications/Multimedia -Requires: gimp = %{epoch}:%{version}-%{release} -Requires: perl - -%description perl -The gimp-perl package contains Perl extensions and plug-ins for the -GIMP image manipulation program. -%endif - %prep %if %prever %setup -q -n gimp-%{version}%{prever} @@ -116,9 +99,19 @@ GIMP image manipulation program. %patch1 -p1 -b .gimphelpmissing %build -# aclocal -I m4macros || aclocal-1.6 -I m4macros || aclocal-1.5 -I m4macros -# automake || automake-1.6 || automake-1.5 -# autoconf || autoconf-2.53 || autoconf-2.52 +# use -32 or -64 postfixed binaries if available +mkdir -p bin +for prg in gdk-pixbuf-csource gdk-pixbuf-query-loaders gtk-query-immodules pango-querymodules; do + if a="$(type -path ${prg}-64 2>/dev/null)"; then + ln -snf "$a" bin/"$prg" + else + if a="$(type -path ${prg}-32 2>/dev/null)"; then + ln -snf "$a" bin/"$prg" + fi + fi +done +export PATH="$PATH:$PWD/bin" + libtoolize --copy --force aclocal -I m4macros perl -pi -e 's/require +XML::Parser/;/g;' aclocal.m4 @@ -129,11 +122,7 @@ if [ ! -f configure ]; then CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix} fi %configure \ -%if %_enable_perl - --enable-perl \ -%else --disable-perl \ -%endif %if %_enable_python --enable-python \ %else @@ -159,56 +148,22 @@ fi make %{?smp_mflags} %install +export PATH="$PATH:$PWD/bin" [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_infodir} $RPM_BUILD_ROOT/%{_includedir} \ $RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir} \ - $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver}/plug-ins + $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver}/plug-ins \ + $RPM_BUILD_ROOT/%{_datadir}/{applications,application-registry,mime-info,pixmaps} # makeinstall macro won't work here - libexec is overriden -#make prefix=$RPM_BUILD_ROOT/%{_prefix} \ -# bindir=$RPM_BUILD_ROOT/%{_bindir} \ -# libdir=$RPM_BUILD_ROOT/%{_libdir} \ -# mandir=$RPM_BUILD_ROOT/%{_mandir} \ -# infodir=$RPM_BUILD_ROOT/%{_infodir} \ -# datadir=$RPM_BUILD_ROOT/%{_datadir} \ -# includedir=$RPM_BUILD_ROOT/%{_includedir} \ -# gimpsysconfdir=$RPM_BUILD_ROOT/%{_sysconfdir}/gimp/%{subver} \ -# gimpplugindir=$RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} \ -# gimpdatadir=$RPM_BUILD_ROOT/%{_datadir}/gimp/%{subver} \ -# PREFIX=$RPM_BUILD_ROOT/%{_prefix} \ -# INSTALLMAN3DIR=$RPM_BUILD_ROOT/usr/lib/perl5/man \ -# INSTALLMAN1DIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \ -# GNOME_DESKTOP_PATH=$RPM_BUILD_ROOT%{_datadir}/applications \ -# install - make DESTDIR=$RPM_BUILD_ROOT install -%if %_enable_perl -# remove the perl temp file to satisfy rpmlint -rm -f `find $RPM_BUILD_ROOT%{_libdir}/perl5/ -name ".packlist"` - -# -# This perl madness will drive me batty -# -eval perl '-V:archname' -find $RPM_BUILD_ROOT/%{_prefix}/lib/perl5 -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v perllocal.pod > gimp-perl -%endif - # # Plugins and modules change often (grab the executeable ones) # echo "%defattr (-, root, root)" > gimp-plugin-files find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v /usr/lib/gimp/%{subver}/modules/.*\.a$ >>gimp-plugin-files -%if %_enable_perl -# -# Now pull the perl ones out. -# -echo "%defattr (-, root, root)" > gimp-perl-plugin-files -echo "%dir %{_libdir}/gimp/%{subver}/plug-ins" >> gimp-perl-plugin-files -find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver} -type f -exec file {} \; | grep perl | cut -d':' -f 1 | sed "s@^$RPM_BUILD_ROOT@@g" >>gimp-perl-plugin-files -%endif - # # Auto detect the lang files. # @@ -237,18 +192,16 @@ fi # # cat gimp-plugin-files gimp-all.lang gimp-tips-files > gimp.files cat gimp-plugin-files gimp-all.lang > gimp.files -%if %_enable_perl -echo "%defattr (-, root, root, 755)" > gimp-perl-files -cat gimp-perl gimp-perl-plugin-files >> gimp-perl-files -%endif -# 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 -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 +## 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 +#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 + +%__ln_s ../gimp/%{subver}/images/wilber-icon.png %{buildroot}/%{_datadir}/pixmaps/gimp.png %if %_enable_convenience # install convenience symlinks @@ -271,8 +224,11 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %defattr (-, root, root, 0755) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO.xml %doc docs/*.txt docs/*.ps docs/*.xcf* docs/*.svg README.i18n README.win32 -%attr(-,root,root) %config(missingok) /%{_datadir}/applications/gimp.desktop -%attr(-,root,root) %config(missingok) /%{_datadir}/mc/templates/gimp.desktop +#%attr(-,root,root) %config(missingok) /%{_datadir}/applications/gimp.desktop +#%attr(-,root,root) %config(missingok) /%{_datadir}/mc/templates/gimp.desktop +%{_datadir}/applications/*.desktop +%{_datadir}/application-registry/*.applications +%{_datadir}/mime-info/*.keys %{_datadir}/pixmaps/gimp.png %dir %{_datadir}/gimp @@ -372,14 +328,18 @@ install -m 644 $RPM_SOURCE_DIR/gimp.png %{buildroot}/%{_datadir}/pixmaps %{_includedir}/gimp-%{subver} %{_libdir}/pkgconfig/* -%if %_enable_perl -%files perl -f gimp-perl-files -%defattr (-, root, root, 0755) -%{_bindir}/gimpdoc -%{_bindir}/xcftopnm -%endif - %changelog +* Thu Jul 22 2004 Nils Philippsen +- version 2.0.3 +- buildreq gtk2-devel >= 2.4.0 +- use -32 or -64 postfixed binaries if available + +* Fri Jul 02 2004 Nils Philippsen +- use included desktop (#126723), application-registry, mime-info and + icon files +- remove perl cruft (Gimp-Perl is an external package now) +- further spec file cleaning + * Thu Jun 24 2004 Nils Philippsen - version 2.0.2 - fix summary (#126682) diff --git a/sources b/sources index 0fdbac2..a7b244f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0dfdf4720e09ffa44fdc4d1bb48f82b gimp-2.0.2.tar.bz2 +393a0dc12919edc78a9c3eba15f9d56b gimp-2.0.3.tar.bz2