From 17a6ecebe292aa35b26eca7021b6627373d587e1 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 05:14:05 +0000 Subject: [PATCH] auto-import changelog data from gimp-2.0-1.pre3.4.1.src.rpm Tue Mar 02 2004 Elliot Lee - rebuilt Wed Feb 18 2004 Tim Waugh - Added epoch to gimp-perl obsoletes tag. Fri Feb 13 2004 Elliot Lee - rebuilt Fri Feb 13 2004 Nils Philippsen - fix typo in %_enable_print macro - install convenience symlinks (gimp, gimp-remote, gimptool) Sun Feb 08 2004 Nils Philippsen - require gtk2, glib2 >= 2.3.0, pango >= 1.3.0 Fri Feb 06 2004 Nils Philippsen - version 2.0pre3 - update buildroot patch - enable building static libs (old default) - have '--define'able enable_* - disable building of print plugin, it's in another package Fri Jan 30 2004 Nils Philippsen - rebuild against new libcroco Sat Jan 24 2004 Nils Philippsen - require %{epoch}:%{version}-%{release} of base package in sub packages - rather use %{?smp_mflags} to actually exploit SMP build systems Fri Jan 23 2004 Nils Philippsen - set epoch to 1 to upgrade old gimp rpms - obsolete gimp2-devel, gimp-beta-devel to allow upgrade of 3rd party repo packages, gimp-perl to upgrade old package Fri Jan 23 2004 Nils Philippsen - fix binary name in desktop file ("gimp-1.3" until gimp-2.0 becomes final, to allow coexistence with old gimp-1.x packages) - system intltool buildrequires perl-XML-Parser, work around that, yay Thu Jan 22 2004 Nils Philippsen - build as gimp, not gimp-beta - remove all the beta blurbs - fix automake dependency - fix libtool usage Tue Jan 20 2004 Nils Philippsen - version 2.0pre2 Sun Jan 11 2004 Nils Philippsen - version 2.0pre1 Tue Nov 25 2003 Nils Philippsen - version 1.3.23 beta Fri Nov 21 2003 Nils Philippsen - version 1.3.22 beta Thu Oct 16 2003 Nils Philippsen - leave gtk-doc documentation in place - move gimptool to main package - own some directories previously not owned --- .cvsignore | 3 +- gimp-2.0pre3-buildroot.patch | 50 ++++ gimp.spec | 549 ++++++++++++++++++++--------------- sources | 3 +- 4 files changed, 364 insertions(+), 241 deletions(-) create mode 100644 gimp-2.0pre3-buildroot.patch diff --git a/.cvsignore b/.cvsignore index dcf3698..7e995ac 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -gimp-1.2.3-wget-fix.patch.bz2 -gimp-1.2.5.tar.bz2 +gimp-2.0pre3.tar.bz2 diff --git a/gimp-2.0pre3-buildroot.patch b/gimp-2.0pre3-buildroot.patch new file mode 100644 index 0000000..e751544 --- /dev/null +++ b/gimp-2.0pre3-buildroot.patch @@ -0,0 +1,50 @@ +--- gimp-2.0pre3/data/misc/Makefile.am.buildroot 2004-02-03 22:53:10.000000000 +0100 ++++ gimp-2.0pre3/data/misc/Makefile.am 2004-02-06 14:45:08.365249703 +0100 +@@ -28,18 +28,18 @@ + + install-data-local: + if DESKTOP_DATADIR +- if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \ +- cd $(DESTDIR)@DESKTOP_DATADIR@/applications \ ++ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/applications; then \ ++ cd $(DESTDIR)$(DESKTOP_DATADIR)/applications \ + && rm -f gimp-@GIMP_APP_VERSION@.desktop \ + && $(LN_S) $(miscdatadir)/gimp.desktop gimp-@GIMP_APP_VERSION@.desktop \ + ; fi +- if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \ +- cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \ ++ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/application-registry; then \ ++ cd $(DESTDIR)$(DESKTOP_DATADIR)/application-registry \ + && rm -f gimp-@GIMP_APP_VERSION@.applications \ + && $(LN_S) $(miscdatadir)/gimp.applications gimp-@GIMP_APP_VERSION@.applications \ + ; fi +- if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \ +- cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \ ++ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/mime-info; then \ ++ cd $(DESTDIR)$(DESKTOP_DATADIR)/mime-info \ + && rm -f gimp-@GIMP_APP_VERSION@.keys \ + && $(LN_S) $(miscdatadir)/gimp.keys gimp-@GIMP_APP_VERSION@.keys \ + ; fi +@@ -47,16 +47,16 @@ + + uninstall-local: + if DESKTOP_DATADIR +- if test -d $(DESTDIR)@DESKTOP_DATADIR@/applications; then \ +- cd $(DESTDIR)@DESKTOP_DATADIR@/applications \ ++ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/applications; then \ ++ cd $(DESTDIR)$(DESKTOP_DATADIR)/applications \ + && rm -f gimp-@GIMP_APP_VERSION@.desktop \ + ; fi +- if test -d $(DESTDIR)@DESKTOP_DATADIR@/application-registry; then \ +- cd $(DESTDIR)@DESKTOP_DATADIR@/application-registry \ ++ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/application-registry; then \ ++ cd $(DESTDIR)$(DESKTOP_DATADIR)/application-registry \ + && rm -f gimp-@GIMP_APP_VERSION@.applications \ + ; fi +- if test -d $(DESTDIR)@DESKTOP_DATADIR@/mime-info; then \ +- cd $(DESTDIR)@DESKTOP_DATADIR@/mime-info \ ++ if test -d $(DESTDIR)$(DESKTOP_DATADIR)/mime-info; then \ ++ cd $(DESTDIR)$(DESKTOP_DATADIR)/mime-info \ + && rm -f gimp-@GIMP_APP_VERSION@.keys \ + ; fi + endif diff --git a/gimp.spec b/gimp.spec index 69c0e18..0ba245e 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,39 +1,57 @@ -%define subver 1.2 -%define age 0 -%define microver 5 +%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} +%define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0} +%define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1} -Summary: The GNU Image Manipulation Program. -Name: gimp -Version: %{subver}.%{microver} -Release: 1 -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 -Requires: gtk+ >= 1.2.0 -Requires: gimp-print-plugin -BuildRequires: gtk+-devel -BuildRequires: glib-devel -Requires: /usr/bin/desktop-file-install -Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/v%{version}/%{name}-%{version}.tar.bz2 -Source1: gimp.desktop -Source2: gimp.png -Source3: filter-gimp-perl-requires.sh -Patch0: gimp-1.1.23-perlpath.patch -Patch3: gimp-1.2.3-wget-fix.patch.bz2 -Patch4: gimp-1.2.5-perl-plugin.patch +%define subver 1.3 +%define age 26 +%define minorver 0 +%define microver 0 +%define prever 3 +%define gimp_lang_ver 20 -%define __perl_requires %{SOURCE3} -%define debug_package %{nil} - -# gcc breaks with -g -# workaround for compiler bug on s390/s390x -%ifarch s390 s390x -%define optflags -O2 +Summary: The GNU Image Manipulation Program BETA +Name: gimp +Version: 2.0 +%if %prever +Release: 1.pre%{prever}.4.1 +%else +Release: 2.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.2.0 +BuildRequires: gtk2-devel >= 1.3.10 +BuildRequires: pango-devel >= 1.2.0 +BuildRequires: fontconfig-devel >= 2.2.0 +BuildRequires: librsvg2-devel +BuildRequires: XFree86-devel +BuildRequires: gimp-print-devel >= 4.2.0 +BuildRequires: automake >= 1.7 +BuildRequires: autoconf >= 2.54 +BuildRequires: libtool >= 1.5 +BuildRequires: perl +Requires: glib2 >= 2.3.0 +Requires: gtk2 >= 2.3.0 +Requires: pango >= 1.3.0 +Requires: fontconfig >= 2.2.0 +%if %prever +Source0: ftp://ftp.gimp.org/pub/gimp/v%{version}/testing/gimp-%{version}pre%{prever}.tar.bz2 +%else +Source0: ftp://ftp.gimp.org/pub/gimp/v%{version}/v%{version}/gimp-%{version}.tar.bz2 +%endif +Source1: gimp.desktop +Source2: gimp.png +Patch0: gimp-2.0pre3-buildroot.patch %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -53,171 +71,180 @@ the fonts have unusual licensing requirements; all the licenses are documented in the package. Get ftp://ftp.gimp.org/pub/gimp/fonts/freefonts-0.10.tar.gz and ftp://ftp.gimp.org/pub/gimp/fonts/sharefonts-0.10.tar.gz if you are so -inclined. Alternatively, choose fonts which exist on your system +inclined. Alternatively, choose fonts which exist on your system before running the scripts. %package devel -Summary: The GIMP plug-in and extension development kit. -Group: Applications/Multimedia -Requires: gtk+-devel, gimp = %{epoch}:%{version} +Summary: GIMP plugin and extension development kit +Group: Applications/Multimedia +Requires: gtk2-devel, %{name} = %{epoch}:%{version}-%{release} +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 extensions. +%if %_enable_perl %package perl -Summary: Perl extensions and plug-ins for the GIMP. -Group: Applications/Multimedia -Requires: gimp = %{epoch}:%{version} -Requires: perl -Provides: perl(Gimp::Util) -Provides: perl(of) -BuildPreReq: perl-PDL Gtk-Perl perl gimp-print-devel +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}pre%{prever} +%else %setup -q -%patch0 -p1 -b .perlpath -%patch3 -p1 -%patch4 -p1 +%endif +%patch0 -p1 -b .buildroot %build -#AUTOMAKE=automake-1.4 autoreconf +# 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 +libtoolize --copy --force +aclocal -I m4macros +perl -pi -e 's/require +XML::Parser/;/g;' aclocal.m4 +automake +autoconf +LIBAA="disable"; export LIBAA if [ ! -f configure ]; then CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --quiet $MYARCH_FLAGS --prefix=%{_prefix} -else - LIBAA="disable" CFLAGS="$RPM_OPT_FLAGS" %configure fi +%configure \ +%if %_enable_perl + --enable-perl \ +%else + --disable-perl \ +%endif +%if %_enable_python + --enable-python \ +%else + --disable-python \ +%endif +%if %_enable_mp + --enable-mp \ +%else + --disable-mp \ +%endif +%if %_enable_static + --enable-static \ +%else + --disable-static \ +%endif +%if %_enable_print + --enable-print \ +%else + --disable-print \ +%endif +; make %{?smp_mflags} %install -sed "s,\(=/\)\([a-z]\),=$RPM_BUILD_ROOT/\2,g" gimptool-1.2 > tmptool -chmod 755 tmptool [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -rootdir=`pwd` -pushd plug-ins/perl -PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor GIMPTOOL=$rootdir/tmptool \ -CFLAGS=-I$(cd ../..;pwd) LDFLAGS=-L$(cd ../../libgimp/.libs;pwd) \ - perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor \ - --disable-gimptest < /dev/null -perl -pi -e "s!-Wl,-rpath,$installarchlib/CORE!!g" Makefile -for I in `find -name Makefile`; do - sed "s,/usr/bin/gimptool,$rootdir/tmptool,g" $I > $I- - mv $I- $I -done -popd 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 - # 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} \ - GIMPTOOL=`pwd`/tmptool \ - install +#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"` -# Strip the executables -strip $RPM_BUILD_ROOT/%{_bindir}/gimp -# Only strip execuable files and leave scripts alone. -strip `file $RPM_BUILD_ROOT/%{_libdir}/gimp/%{subver}/plug-ins/* | grep ELF | cut -d':' -f 1` - -# Compress down the online documentation. -if [ -d $RPM_BUILD_ROOT/%{_mandir} ]; then - find $RPM_BUILD_ROOT/%{_mandir} -type f -exec gzip -9nf {} \; -fi - # # This perl madness will drive me batty # eval perl '-V:archname' -find $RPM_BUILD_ROOT/%{_libdir}/perl5 -type f -print | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v perllocal.pod > gimp-perl - -# Don't ship the print plug-in, but instead get it from gimp-print. -rm -f %{buildroot}%{_libdir}/gimp/*/plug-ins/print +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 (0755, 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 %{_libdir}/gimp/%{subver}/modules/.*\.a$ | grep -v %{_libdir}/gimp/%{subver}/modules/.*\.la$ >>gimp-plugin-files +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 (0755, root, root)" > gimp-perl-plugin-files +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. # if [ -f /usr/lib/rpm/find-lang.sh ] ; then - /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %{name} - /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-std-plugins - /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-script-fu - /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-perl - /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp-libgimp - cat %{name}.lang gimp-std-plugins.lang gimp-script-fu.lang \ - gimp-libgimp.lang > gimp-all.lang + /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver} + /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}-std-plug-ins + /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}-script-fu + /usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT gimp%{gimp_lang_ver}-libgimp + cat gimp%{gimp_lang_ver}.lang gimp%{gimp_lang_ver}-std-plug-ins.lang gimp%{gimp_lang_ver}-script-fu.lang gimp%{gimp_lang_ver}-libgimp.lang > gimp-all.lang +else + echo '%{_datadir}/locale/*/*/*' > gimp-all.lang fi -# -# Tips -# -echo "%defattr (644, root, root, 555)" >gimp-tips-files -echo "%{_datadir}/gimp/%{subver}/tips/gimp_tips.txt" >> gimp-tips-files -for I in `ls $RPM_BUILD_ROOT/%{_datadir}/gimp/%{subver}/tips/gimp*.[a-z]*.txt | sed "s@^$RPM_BUILD_ROOT/@@g"`; do - tip_lang=`basename $I | cut -d'.' -f2` - echo "%lang($tip_lang) $I" >> gimp-tips-files -done +# # +# # Tips +# # +# echo "%defattr (-, root, root, 555)" >gimp-tips-files +# echo "%{_datadir}/gimp/%{subver}/tips/gimp_tips.txt" >> gimp-tips-files +# for I in `ls $RPM_BUILD_ROOT/%{_datadir}/gimp/%{subver}/tips/gimp*.[a-z]*.txt | sed "s@^$RPM_BUILD_ROOT/@@g"`; do +# tip_lang=`basename $I | cut -d'.' -f2` +# echo "%lang($tip_lang) $I" >> gimp-tips-files +# done # # Build the master filelists generated from the above mess. # -cat gimp-plugin-files gimp-all.lang gimp-tips-files > gimp.files -echo "%defattr (555, root, root, 555)" > gimp-perl-files +# 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 -cat gimp-perl.lang >> gimp-perl-files +%endif # install desktop entry mkdir -p %{buildroot}/%{_datadir}/applications mkdir -p %{buildroot}/%{_datadir}/mc/templates -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install \ - --vendor gnome \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category "Application;Graphics;X-Red-Hat-Base" \ - $RPM_SOURCE_DIR/gimp.desktop +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 -# files we don't ship -rm -f %{buildroot}%{_bindir}/escputil* \ - %{buildroot}%{_mandir}/man1/escputil* \ - %{buildroot}%{_bindir}/embedxpm \ - %{buildroot}%{_mandir}/man1/embedxpm* \ - %{buildroot}%{_bindir}/scm2perl \ - %{buildroot}%{_mandir}/man1/scm2perl* \ - %{buildroot}%{_bindir}/scm2scm \ - %{buildroot}%{_mandir}/man1/scm2scm* -rm -rf %{buildroot}%{_datadir}/gimp/*/devel-docs -find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f +%if %_enable_convenience +# install convenience symlinks +ln -s gimp-%{subver} %{buildroot}/%{_bindir}/gimp +ln -s gimp-remote-%{subver} %{buildroot}/%{_bindir}/gimp-remote +ln -s gimptool-%{version} %{buildroot}/%{_bindir}/gimptool +%endif %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -227,18 +254,28 @@ find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f %postun -p /sbin/ldconfig %files -f gimp.files -%defattr (0644, root, root, 0755) -%doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README TODO -%doc docs/*.txt docs/*.ps ABOUT-NLS README.i18n README.perl README.win32 TODO -%attr(-,root,root) %config(missingok) /%{_datadir}/applications/*.desktop +%defattr(-, root, root, 0755) +%{_datadir}/gimp/%{subver}/misc/ + +%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 %{_datadir}/pixmaps/gimp.png +%dir %{_datadir}/gimp %dir %{_datadir}/gimp/%{subver} %dir %{_datadir}/gimp/%{subver}/tips +%{_datadir}/gimp/%{subver}/tips/* +%dir %{_libdir}/gimp %dir %{_libdir}/gimp/%{subver} +%dir %{_libdir}/gimp/%{subver}/environ +#%dir %{_libdir}/gimp/%{subver}/fonts %dir %{_libdir}/gimp/%{subver}/modules %dir %{_libdir}/gimp/%{subver}/plug-ins +%dir %{_libdir}/gimp/%{subver}/python +#%dir %{_libdir}/gimp/%{subver}/tool-plug-ins %{_datadir}/gimp/%{subver}/brushes/ %{_datadir}/gimp/%{subver}/fractalexplorer/ @@ -246,157 +283,195 @@ find %{buildroot}%{_libdir}/perl5 -name perllocal.pod | xargs rm -f %{_datadir}/gimp/%{subver}/gflare/ %{_datadir}/gimp/%{subver}/gimpressionist/ %{_datadir}/gimp/%{subver}/gradients/ -%{_datadir}/gimp/%{subver}/help/ +# %{_datadir}/gimp/%{subver}/help/ +%{_datadir}/gimp/%{subver}/images/ %{_datadir}/gimp/%{subver}/palettes/ %{_datadir}/gimp/%{subver}/patterns/ %{_datadir}/gimp/%{subver}/scripts/ +%{_datadir}/gimp/%{subver}/themes/ -%{_sysconfdir}/gimp/%{subver}/gimprc -%{_sysconfdir}/gimp/%{subver}/gimprc_user -%{_sysconfdir}/gimp/%{subver}/gtkrc -%{_sysconfdir}/gimp/%{subver}/gtkrc_user -%{_sysconfdir}/gimp/%{subver}/unitrc -%{_sysconfdir}/gimp/%{subver}/ps-menurc +%dir %{_sysconfdir}/gimp +%dir %{_sysconfdir}/gimp/%{subver} +%config(noreplace) %{_sysconfdir}/gimp/%{subver}/gimprc +#%config(noreplace) %{_sysconfdir}/gimp/%{subver}/gimprc_user +%config(noreplace) %{_sysconfdir}/gimp/%{subver}/gtkrc +#%config(noreplace) %{_sysconfdir}/gimp/%{subver}/gtkrc_user +%config(noreplace) %{_sysconfdir}/gimp/%{subver}/unitrc +%config(noreplace) %{_sysconfdir}/gimp/%{subver}/ps-menurc +%config(noreplace) %{_sysconfdir}/gimp/%{subver}/sessionrc +%config(noreplace) %{_sysconfdir}/gimp/%{subver}/templaterc -%{_datadir}/gimp/%{subver}/gimp_logo.ppm -%{_datadir}/gimp/%{subver}/gimp_splash.ppm +#%{_datadir}/locale/*/*/* -%defattr (0755, root, root) -%{_datadir}/gimp/%{subver}/user_install - -%{_libdir}/libgimp-%{subver}.so.%{age}.0.%{microver} +#%{_libdir}/libgck-%{subver}.so.%{age}.%{minorver}.%{microver} +#%{_libdir}/libgck-%{subver}.so.%{age} +%{_libdir}/libgimp-%{subver}.so.%{age}.%{minorver}.%{microver} %{_libdir}/libgimp-%{subver}.so.%{age} -%{_libdir}/libgimpui-%{subver}.so.%{age}.0.%{microver} +%{_libdir}/libgimpbase-%{subver}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpbase-%{subver}.so.%{age} +%{_libdir}/libgimpcolor-%{subver}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpcolor-%{subver}.so.%{age} +%{_libdir}/libgimpmath-%{subver}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpmath-%{subver}.so.%{age} +%{_libdir}/libgimpmodule-%{subver}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpmodule-%{subver}.so.%{age} +%{_libdir}/libgimpthumb-%{subver}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpthumb-%{subver}.so.%{age} +%{_libdir}/libgimpui-%{subver}.so.%{age}.%{minorver}.%{microver} %{_libdir}/libgimpui-%{subver}.so.%{age} -%{_libdir}/libgck-%{subver}.so.%{age}.0.%{microver} -%{_libdir}/libgck-%{subver}.so.%{age} +%{_libdir}/libgimpwidgets-%{subver}.so.%{age}.%{minorver}.%{microver} +%{_libdir}/libgimpwidgets-%{subver}.so.%{age} +#%{_libdir}/libgimpproxy-%{subver}.so.%{age}.%{minorver}.%{microver} +#%{_libdir}/libgimpproxy-%{subver}.so.%{age} +#%{_libdir}/libgimptool-%{subver}.so.%{age}.%{minorver}.%{microver} +#%{_libdir}/libgimptool-%{subver}.so.%{age} -%{_bindir}/gimp %{_bindir}/gimp-%{subver} -%{_bindir}/gimp-remote* +%{_bindir}/gimp-remote-%{subver} +%{_bindir}/gimptool-%{version} +#%{_bindir}/embedxpm +#%{_bindir}/escputil-%{subver} -%defattr (0644, root, root) -%{_mandir}/man1/gimp.1* +%if %_enable_convenience +%{_bindir}/gimp +%{_bindir}/gimp-remote +%{_bindir}/gimptool +%endif + +%defattr (-, root, root) %{_mandir}/man1/gimp-%{subver}.1* -%{_mandir}/man5/gimprc.5* +%{_mandir}/man1/gimp-remote-%{subver}.1* +%{_mandir}/man1/gimptool-%{version}.1* +#%{_mandir}/man1/escputil-%{subver}.1.* %{_mandir}/man5/gimprc-%{subver}.5* -%{_mandir}/man1/gimp-remote* %files devel -%defattr (0755, root, root, 0755) -%{_bindir}/gimptool -%{_bindir}/gimptool-%{subver} -%{_bindir}/gimp-config +%defattr (-, root, root, 0755) +#%{_bindir}/gimp-config-1.4 %{_libdir}/*.so %{_libdir}/*.la -%dir %{_libdir}/gimp/%{subver}/modules %{_libdir}/gimp/%{subver}/modules/*.la -%defattr (0644, root, root, 0755) -%{_datadir}/aclocal/gimp.m4 +%defattr (-, root, root, 0755) +%doc HACKING +%doc %{_datadir}/gtk-doc/* +%{_datadir}/aclocal/*.m4 %{_libdir}/*.a %{_libdir}/gimp/%{subver}/modules/*.a -%{_includedir}/libgimp/ -%{_includedir}/gck/ -%{_mandir}/man1/gimptool.1* -%{_mandir}/man1/gimptool-%{subver}.1* +%{_includedir}/gimp-%{subver} +%{_libdir}/pkgconfig/* +%if %_enable_perl %files perl -f gimp-perl-files -%defattr (0755, root, root, 0755) +%defattr (-, root, root, 0755) %{_bindir}/gimpdoc %{_bindir}/xcftopnm -%{_mandir}/man1/xcftopnm* -%{_mandir}/man3/* +%endif %changelog -* Wed Oct 15 2003 Matt Wilson 1:1.2.5-1 -- 1.2.5 (#101225) - -* Sun Jun 8 2003 Tim Powers 1:1.2.3-20.1 -- build for RHEL - -* Fri Jun 6 2003 Matt Wilson 1:1.2.3-20 -- add epoch to the version requirements of subpackages -- ship gimp-remote (#85344) - -* Wed Jun 04 2003 Elliot Lee +* Tue Mar 02 2004 Elliot Lee - rebuilt -* Wed Jun 4 2003 Than Ngo 1:1.2.3-18 -- fix build problem with gcc 3.3 -- workaround for compiler bug on s390/s390x +* Wed Feb 18 2004 Tim Waugh +- Added epoch to gimp-perl obsoletes tag. -* Wed Feb 19 2003 Tim Waugh 1:1.2.3-16 -- Require gimp-print-plugin (bug #80437). - -* Wed Jan 22 2003 Tim Powers +* Fri Feb 13 2004 Elliot Lee - rebuilt -* Sat Jan 4 2003 Jeff Johnson 1:3-14 -- use internal dep generator. +* Fri Feb 13 2004 Nils Philippsen +- fix typo in %%_enable_print macro +- install convenience symlinks (gimp, gimp-remote, gimptool) -* Sat Dec 14 2002 Tim Powers 1:3-13 -- don't use rpms internal dep generator +* Sun Feb 08 2004 Nils Philippsen +- require gtk2, glib2 >= 2.3.0, pango >= 1.3.0 -* Mon Dec 9 2002 Tim Powers 1:1.23-12 -- rebuild to pick up some plug-ins -- add some BuildPreReq's on some perl packages for the gimp-perl package +* Fri Feb 06 2004 Nils Philippsen +- version 2.0pre3 +- update buildroot patch +- enable building static libs (old default) +- have '--define'able enable_* +- disable building of print plugin, it's in another package -* Tue Nov 5 2002 Tim Waugh 1.2.3-11 -- Don't ship the print plug-in. This comes from gimp-print instead. +* Fri Jan 30 2004 Nils Philippsen +- rebuild against new libcroco -* Tue Nov 5 2002 Tim Waugh 1.2.3-10 -- Use %%{_libdir}. -- Don't use previously-installed gimptool when building. -- Build requires glib-devel. -- Don't install files not shipped. -- Clean up doc files in manifest. -- Ship more translations. -- Ship xcftopnm man page, and gimp-perl man pages. +* Sat Jan 24 2004 Nils Philippsen +- require %%{epoch}:%%{version}-%%{release} of base package in sub packages +- rather use %%{?smp_mflags} to actually exploit SMP build systems -* Fri Aug 30 2002 Tim Powers -- filter out gimp-perl dep on perl(PDL::LiteF) +* Fri Jan 23 2004 Nils Philippsen +- set epoch to 1 to upgrade old gimp rpms +- obsolete gimp2-devel, gimp-beta-devel to allow upgrade of 3rd party repo + packages, gimp-perl to upgrade old package -* Fri Aug 30 2002 Matt Wilson -- use desktop-file-install -- nuke rpath in perl plugin +* Fri Jan 23 2004 Nils Philippsen +- fix binary name in desktop file ("gimp-1.3" until gimp-2.0 becomes final, to + allow coexistence with old gimp-1.x packages) +- system intltool buildrequires perl-XML-Parser, work around that, yay -* Mon Aug 19 2002 Matt Wilson -- fix up gimp-perl madness to work with 5.8.0 (#66610, #68782) -- added gimp-1.2.3-newperl.patch.bz2 from Mandrake's gimp package -- added gimp-1.2.3-wget-fix.patch.bz2 from Mandrake's gimp package -- fix desktop file (#71021) +* Thu Jan 22 2004 Nils Philippsen +- build as gimp, not gimp-beta +- remove all the beta blurbs +- fix automake dependency +- fix libtool usage -* Thu May 23 2002 Tim Powers -- automated rebuild +* Tue Jan 20 2004 Nils Philippsen +- version 2.0pre2 -* Mon Apr 15 2002 Matt Wilson -- filter .la files from main gimp package (#43317, #57571, #56667, - #51591, #63371) +* Sun Jan 11 2004 Nils Philippsen +- version 2.0pre1 -* Tue Mar 19 2002 Matt Wilson -- added missing man pages (#61426) -- removed esputil man page (#58919) +* Tue Nov 25 2003 Nils Philippsen +- version 1.3.23 beta -* Fri Mar 15 2002 Matt Wilson -- added /usr/bin/{gimp-config,gimptool}-1.2 +* Fri Nov 21 2003 Nils Philippsen +- version 1.3.22 beta -* Mon Mar 11 2002 Matt Wilson -- 1.2.3, based on changes from Ed Halley below: - - removed gimp-1.2.1-locale.patch as the patch was incorporated upstream - - linked new versioned gimp-1.2 executable to traditional gimp name +* Thu Oct 16 2003 Nils Philippsen +- leave gtk-doc documentation in place +- move gimptool to main package +- own some directories previously not owned -* Mon Feb 25 2002 Than Ngo 1.2.1-11 -- rebuild in new enviroment +* Tue Oct 07 2003 Nils Philippsen +- version 1.3.21 beta -* Thu Jan 31 2002 Bill Nottingham -- escputil lives in ghostscript now +* Thu Sep 11 2003 Nils Philippsen +- version 1.3.20 beta -* Thu Jan 31 2002 Jeremy Katz -- add silly perl dependencies that don't get automatically found +* Mon Aug 11 2003 Nils Philippsen +- version 1.3.18 beta -* Wed Jan 30 2002 Jeremy Katz -- rebuild in new environment +* Thu Jul 10 2003 Nils Philippsen +- don't specify file modes with defattr + +* Wed Jul 09 2003 Nils Philippsen +- use system libtool + +* Fri Jul 04 2003 Nils Philippsen +- version 1.3.16 beta +- update buildroot patch + +* Tue Mar 25 2003 Nils Philippsen +- version 1.3.13 beta +- use automake-1.7 + +* Tue Feb 18 2003 Nils Philippsen +- version 1.3.12 beta + +* Fri Oct 25 2002 Nils Philippsen +- version 1.3.9 beta +- move desktop file to /usr/share/applications + +* Wed Aug 28 2002 Nils Philippsen +- version 1.3.8 beta +- update and fix buildroot patch, don't run automake/autoconf + +* Mon Jul 08 2002 Nils Philippsen +- version 1.3.7 beta +- use automake 1.5 and autoconf 2.53 + +* Fri Mar 15 2002 Nils Philippsen +- version 1.3.4 beta * Thu Jul 19 2001 Tim Powers - remove the perl temp files to pacify rpmlint diff --git a/sources b/sources index e5ce0bd..704f9eb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b528311805c993094b196ed3eb7c0cd1 gimp-1.2.3-wget-fix.patch.bz2 -b83b55d80e6728268d56620ea4d3051a gimp-1.2.5.tar.bz2 +f4d45d83cba87bc9d45399b0e6bce27c gimp-2.0pre3.tar.bz2