From 6db91a69745dd55fc8e365bca12c349f21024148 Mon Sep 17 00:00:00 2001 From: Nicoleau Fabien Date: Mar 13 2010 20:57:42 +0000 Subject: Update to 0.2.7 --- diff --git a/.cvsignore b/.cvsignore index fdbba18..97aff6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -phatch-0.1.6.tar.gz +phatch-0.2.7.1.tar.gz diff --git a/phatch.spec b/phatch.spec index 12969f9..592a18f 100644 --- a/phatch.spec +++ b/phatch.spec @@ -1,32 +1,53 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define debug_package %{nil} Name: phatch -Version: 0.1.6 -Release: 5%{?dist} +Version: 0.2.7 +Release: 1%{?dist} Summary: Photo batch processor - Group: Applications/Multimedia License: GPLv3+ URL: http://photobatch.stani.be/ -Source0: http://sd-2469.dedibox.fr/photobatch/download/package/%{name}-%{version}.tar.gz +Source0: http://photobatch.stani.be/download/package/%{name}-%{version}.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + BuildRequires: gettext BuildRequires: python BuildRequires: desktop-file-utils -BuildRequires: nautilus-python-devel BuildRequires: python-setuptools-devel -Requires: findutils wxPython python-imaging python-exif + +Requires: hicolor-icon-theme +Requires: xdg-utils +Requires: wxPython +Requires: %{name}-cli = %{version}-%{release} %description Phatch is a simple to use cross-platform GUI Photo Batch Processor which handles all popular image formats and can duplicate -(sub)folder hierarchies. Phatch can batch resize, rotate, +(sub)folder hierarchies. Phatch can batch re-size, rotate, apply perspective, shadows, rounded corners, ... and more in minutes instead of hours or days if you do it manually. Phatch allows you to use EXIF and IPTC tags for renaming and data stamping. Phatch also supports a console version -to batch photos on webservers. +to batch photos on web-servers. + +%package cli +Summary: Command line interface for phatch +Group: Applications/Multimedia +Requires: python-imaging +Requires: notify-python +Requires: pyexiv2 +Requires: /usr/bin/tiffcp +Requires: /usr/bin/tiffinfo +Requires: thai-scalable-purisa-fonts +Requires: gnu-free-sans-fonts +Requires: mlocate +Requires: dcraw +Requires: ImageMagick +Requires: /usr/bin/jpegtran +Requires: fbida +Requires: xcftools %package -n nautilus-%{name} Summary: Nautilus extension for %{name} @@ -34,40 +55,39 @@ Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} Requires: nautilus-python +%description cli +Command line interface for phatch + %description -n nautilus-%{name} Nautilus extension for %{name} - %prep -%setup -q -# for wrong-file-end-of-line-encoding and timestamp -sed 's/\r//' docs/phatch_dev/docbook-xsl.css > docs/phatch_dev/docbook-xsl.css.new -touch -c -r docs/phatch_dev/docbook-xsl.css docs/phatch_dev/docbook-xsl.css.new -mv docs/phatch_dev/docbook-xsl.css.new docs/phatch_dev/docbook-xsl.css - -# change software version -sed -e 's|0\.1\.5|0\.1\.6|' -e 's|20080606224435|200811091037|' \ - phatch/data/version.py > phatch/data/version.py.16 -touch -c -r phatch/data/version.py phatch/data/version.py.16 -mv phatch/data/version.py.16 phatch/data/version.py +%setup -q +rm -f docs/build/html/.buildinfo +# let %%doc manage documentation +sed -i -e 's/\+ doc_files//' setup.py +# Change search path for documentation +sed -i -e "s@help_path =.*@help_path=\'%{_datadir}/doc/%{name}-%{version}\'@" %{name}/pyWx/gui.py %build -CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build - +%{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT -python -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT desktop-file-install --vendor="" \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop +desktop-file-install --vendor="" \ + --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \ + $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}-inspector.desktop %find_lang %{name} # for non-executable-script -chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/%{name}.py +chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/%{name}/{%{name}.py,lib/pyWx/dialogsInspector.py,lib/metadataTest.py,other/surd.py,other/EXIF.py,other/pep8.py} -%post +%post -n %{name} touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -75,7 +95,7 @@ fi update-desktop-database &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || : -%postun +%postun -n %{name} touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ] ; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : @@ -83,40 +103,52 @@ fi update-desktop-database &> /dev/null || : update-mime-database %{_datadir}/mime &> /dev/null || : + %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}.lang +%files %defattr(-,root,root,-) -%doc AUTHORS COPYING README docs/* -%dir %{python_sitelib}/%{name} -%dir %{_datadir}/%{name} -%{_bindir}/%{name} +%doc COPYING docs/build/html/* %{_datadir}/applications/%{name}.desktop -%{_datadir}/icons/hicolor/48x48/apps/%{name}.png -%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{python_sitelib}/%{name}/* -%{_mandir}/man?/%{name}* -%{_datadir}/%{name}/* +%{_datadir}/applications/%{name}-inspector.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}*.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg %{_datadir}/mime/packages/%{name}.xml %{_datadir}/pixmaps/%{name}.png -%{python_sitelib}/*egg-info +%{_datadir}/pixmaps/%{name}-inspector.png +%{python_sitelib}/%{name}/pyWx +%{python_sitelib}/%{name}/lib/pyWx +%files cli -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS COPYING README +%{python_sitelib}/%{name} +%{_bindir}/%{name} +%{_datadir}/%{name} +%{_mandir}/man?/%{name}* +%{python_sitelib}/*egg-info +%exclude %{python_sitelib}/%{name}/pyWx +%exclude %{python_sitelib}/%{name}/lib/pyWx %files -n nautilus-%{name} %defattr(-,root,root,-) %doc COPYING -%{_libdir}/nautilus/extensions-2.0/python/%{name}_* +%{python_sitelib}/%{name}/lib/linux/nautilusExtension.* %changelog +* Sat Mar 13 2010 Nicoleau Fabien - 0.2.7-1 +- Update to 0.2.7 +- Package is now noarch +* Thu Dec 15 2009 Nicoleau Fabien - 0.2.5-1 +- Update to 0.2.5 +- New cli subpackage to use the application with no gui requirements * Sun Jul 26 2009 Fedora Release Engineering - 0.1.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - * Thu Feb 26 2009 Fedora Release Engineering - 0.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - * Fri Dec 19 2008 Nicoleau Fabien - 0.1.6-3 - Fix requires for nautilus-extension - Licence file added to nautilus-extension diff --git a/sources b/sources index 8770e69..069c533 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4be29a450c039aaf4071952655b2468f phatch-0.1.6.tar.gz +c0638bcc6510d340c03c40ddfb0a0c2f phatch-0.2.7.1.tar.gz