diff --git a/.cvsignore b/.cvsignore index 7aed064..fb91075 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gimp-2.0.5.tar.bz2 +gimp-2.2-pre1.tar.bz2 diff --git a/gimp.spec b/gimp.spec index 8118b67..fe56ffd 100644 --- a/gimp.spec +++ b/gimp.spec @@ -1,25 +1,23 @@ +%define prever pre1 + +%define binver 2.2 +%define gimp_lang_ver 20 +%define interfacever 2.0 +%define age 0 +%define minorver 200 +%define microver 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} -%define subver 2.0 -%define age 0 -%define minorver 0 -%define microver 5 -%define prever 0 -%define gimp_lang_ver 20 - Summary: The GNU Image Manipulation Program Name: gimp -Version: 2.0.5 -%if %prever -Release: 0.%{prever}.1 -%else -Release: 5 -%endif -Epoch: 1 +Version: 2.2 +Release: %{?prever:0.0.%{prever}.}1 +Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia URL: http://www.gimp.org/ @@ -46,6 +44,7 @@ BuildRequires: autoconf >= 2.54 BuildRequires: libtool >= 1.5 BuildRequires: perl BuildRequires: libwmf-devel >= 0.2.8 +BuildRequires: intltool PreReq: desktop-file-utils >= 0.9 Requires: glib2 >= 2.3.0 Requires: gtk2 >= 2.3.0 @@ -54,14 +53,9 @@ Requires: fontconfig >= 2.2.0 Requires: gimp-print >= 4.2.0 Requires(post): /sbin/ldconfig /usr/bin/update-desktop-database Requires(postun): /sbin/ldconfig /usr/bin/update-desktop-database -%if %prever -Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/testing/gimp-%{version}%{prever}.tar.bz2 -%else -Source0: ftp://ftp.gimp.org/pub/gimp/v%{subver}/gimp-%{version}.tar.bz2 -%endif +Source0: ftp://ftp.gimp.org/pub/gimp/v%{interfacever}/%{?prever:testing}/gimp-%{version}%{?prever:-%{prever}}.tar.bz2 Patch0: gimp-2.0pre3-buildroot.patch Patch1: gimp-2.0.1-gimphelpmissing.patch -Patch2: gimp-2.0.5-invalidbpp.patch %description The GIMP (GNU Image Manipulation Program) is a powerful image @@ -95,19 +89,15 @@ for writing GNU Image Manipulation Program (GIMP) plug-ins and extensions. %prep -%if %prever -%setup -q -n gimp-%{version}%{prever} -%else -%setup -q -%endif +%setup -q -n gimp-%{version}%{?prever:-%{prever}} %patch0 -p1 -b .buildroot %patch1 -p1 -b .gimphelpmissing -%patch2 -p1 -b .invalidbpp %build libtoolize --copy --force +intltoolize --automake --copy --force aclocal -I m4macros -perl -pi -e 's/require +XML::Parser/;/g;' aclocal.m4 +#perl -pi -e 's/require +XML::Parser/;/g;' aclocal.m4 automake autoconf LIBAA="disable"; export LIBAA @@ -145,24 +135,17 @@ 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/%{interfacever}/plug-ins \ $RPM_BUILD_ROOT/%{_datadir}/{applications,application-registry,mime-info,pixmaps} # makeinstall macro won't work here - libexec is overriden make DESTDIR=$RPM_BUILD_ROOT install -# build MimeType list -pushd $RPM_BUILD_ROOT%{_datadir}/gimp/%{subver}/misc -# canary -[ ! "$(perl -e 'while (<>) { m/^MimeType=/ && print $_ }' < gimp.desktop)" ] -perl -e 'print "MimeType="; while (<>) { m/^$/ && next; m/^[ \t]/ && next; m/^#/ && next; chomp (); print "$_;"; } print "\n";' < gimp.keys >> gimp.desktop -popd - # # 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 +find $RPM_BUILD_ROOT/%{_libdir}/gimp/%{interfacever} -type f -exec file {} \; | grep -v perl | cut -d':' -f 1 | sed "s@^$RPM_BUILD_ROOT@@g" | grep -v /usr/lib/gimp/%{interfacever}/modules/.*\.a$ >>gimp-plugin-files # # Auto detect the lang files. @@ -177,42 +160,18 @@ else echo '%{_datadir}/locale/*/*/*' > gimp-all.lang fi -# # -# # 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 cat gimp-plugin-files gimp-all.lang > gimp.files -## 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 -[ ! -L %{buildroot}/%{_bindir}/gimp ] && ln -s gimp-%{subver} %{buildroot}/%{_bindir}/gimp -[ ! -L %{buildroot}/%{_bindir}/gimp-remote ] && ln -s gimp-remote-%{subver} %{buildroot}/%{_bindir}/gimp-remote -[ ! -L %{buildroot}/%{_bindir}/gimptool ] && ln -s gimptool-%{subver} %{buildroot}/%{_bindir}/gimptool +[ ! -L %{buildroot}/%{_bindir}/gimp ] && ln -s gimp-%{binver} %{buildroot}/%{_bindir}/gimp +[ ! -L %{buildroot}/%{_bindir}/gimp-remote ] && ln -s gimp-remote-%{binver} %{buildroot}/%{_bindir}/gimp-remote +[ ! -L %{buildroot}/%{_bindir}/gimptool ] && ln -s gimptool-%{interfacever} %{buildroot}/%{_bindir}/gimptool %endif -# Rename desktop title -perl -pi -e 's/^Name=The GIMP$/Name=GIMP Image Editor/;s/^Name\[de\]=GIMP/Name[de]=GIMP Bildbearbeitung/;' %{buildroot}%{_datadir}/gimp/%{subver}/misc/gimp.desktop - %clean [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -228,9 +187,6 @@ fi %files -f gimp.files %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 @@ -238,75 +194,76 @@ fi %{_datadir}/applications/*.desktop %{_datadir}/application-registry/*.applications %{_datadir}/mime-info/*.keys -%{_datadir}/pixmaps/gimp.png %dir %{_datadir}/gimp -%dir %{_datadir}/gimp/%{subver} -%dir %{_datadir}/gimp/%{subver}/tips -%{_datadir}/gimp/%{subver}/tips/* +%dir %{_datadir}/gimp/%{interfacever} +%{_datadir}/gimp/%{interfacever}/tips/ +%{_datadir}/gimp/%{interfacever}/misc/ +%{_datadir}/gimp/%{interfacever}/menus/ %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/ -%{_datadir}/gimp/%{subver}/gfig/ -%{_datadir}/gimp/%{subver}/gflare/ -%{_datadir}/gimp/%{subver}/gimpressionist/ -%{_datadir}/gimp/%{subver}/gradients/ -# %{_datadir}/gimp/%{subver}/help/ -%{_datadir}/gimp/%{subver}/images/ -%{_datadir}/gimp/%{subver}/palettes/ -%{_datadir}/gimp/%{subver}/patterns/ -%{_datadir}/gimp/%{subver}/scripts/ -%{_datadir}/gimp/%{subver}/themes/ +%dir %{_libdir}/gimp/%{interfacever} +%dir %{_libdir}/gimp/%{interfacever}/environ +#%dir %{_libdir}/gimp/%{interfacever}/fonts +%dir %{_libdir}/gimp/%{interfacever}/modules +%dir %{_libdir}/gimp/%{interfacever}/plug-ins +%dir %{_libdir}/gimp/%{interfacever}/python +#%dir %{_libdir}/gimp/%{interfacever}/tool-plug-ins + +%{_datadir}/gimp/%{interfacever}/brushes/ +%{_datadir}/gimp/%{interfacever}/fractalexplorer/ +%{_datadir}/gimp/%{interfacever}/gfig/ +%{_datadir}/gimp/%{interfacever}/gflare/ +%{_datadir}/gimp/%{interfacever}/gimpressionist/ +%{_datadir}/gimp/%{interfacever}/gradients/ +# %{_datadir}/gimp/%{interfacever}/help/ +%{_datadir}/gimp/%{interfacever}/images/ +%{_datadir}/gimp/%{interfacever}/palettes/ +%{_datadir}/gimp/%{interfacever}/patterns/ +%{_datadir}/gimp/%{interfacever}/scripts/ +%{_datadir}/gimp/%{interfacever}/themes/ %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 +%dir %{_sysconfdir}/gimp/%{interfacever} +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/controllerrc +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc +#%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gimprc_user +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gtkrc +#%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/gtkrc_user +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/unitrc +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/ps-menurc +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/sessionrc +%config(noreplace) %{_sysconfdir}/gimp/%{interfacever}/templaterc #%{_datadir}/locale/*/*/* -#%{_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}/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}/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-%{subver} -%{_bindir}/gimp-remote-%{subver} -%{_bindir}/gimptool-%{subver} +#%{_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} #%{_bindir}/embedxpm -#%{_bindir}/escputil-%{subver} +#%{_bindir}/escputil-%{interfacever} %if %_enable_convenience %{_bindir}/gimp @@ -315,29 +272,38 @@ fi %endif %defattr (-, root, root) -%{_mandir}/man1/gimp-%{subver}.1* -%{_mandir}/man1/gimp-remote-%{subver}.1* -%{_mandir}/man1/gimptool-%{subver}.1* -#%{_mandir}/man1/escputil-%{subver}.1.* -%{_mandir}/man5/gimprc-%{subver}.5* +%{_mandir}/man1/gimp-%{binver}.1* +%{_mandir}/man1/gimp-remote-%{binver}.1* +%{_mandir}/man1/gimptool-%{interfacever}.1* +#%{_mandir}/man1/escputil-%{interfacever}.1.* +%{_mandir}/man5/gimprc-%{binver}.5* %files devel %defattr (-, root, root, 0755) #%{_bindir}/gimp-config-1.4 %{_libdir}/*.so %{_libdir}/*.la -%{_libdir}/gimp/%{subver}/modules/*.la +%{_libdir}/gimp/%{interfacever}/modules/*.la %defattr (-, root, root, 0755) %doc HACKING %doc %{_datadir}/gtk-doc/* %{_datadir}/aclocal/*.m4 %{_libdir}/*.a -%{_libdir}/gimp/%{subver}/modules/*.a -%{_includedir}/gimp-%{subver} +%{_libdir}/gimp/%{interfacever}/modules/*.a +%{_includedir}/gimp-%{interfacever} %{_libdir}/pkgconfig/* %changelog +* Wed Nov 03 2004 Nils Philippsen +- version 2.2-pre1 + +* Sun Oct 24 2004 Nils Philippsen +- remove unnecessary echo statement + +* Fri Oct 15 2004 Nils Philippsen +- version 2.1.7 unstable + * Thu Oct 14 2004 Nils Philippsen - catch wrong values of bpp in BMP plugin (#135675), don't forget 1bpp and 24bpp (d'oh) diff --git a/sources b/sources index 1875fc7..4ffd86d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b24d069b9d670d92fc75ba7035e9300d gimp-2.0.5.tar.bz2 +f88e30b6a11b2d3c81219bc10a6de19a gimp-2.2-pre1.tar.bz2