I have made the following changes intended for : CE:UX:MTF / libquill CE:UX:MTF / python-imaging CE:UX:MTF / quillimagefilter CE:UX:MTF / tumbler
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/4329 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4329: Messages from BOSS: State: review at 2012-02-09T15:09:59 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / libquill -> CE:UX:MTF / libquill changes files: -------------- --- libquill.changes +++ libquill.changes @@ -0,0 +1,3 @@ +* Thu Feb 09 2012 Marko Saukko <[email protected]> - 1.111202.0 +- Minor packaging cleanup. + spec files: ----------- --- libquill.spec +++ libquill.spec @@ -23,7 +23,6 @@ BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(exempi-2.0) BuildRequires: fdupes -BuildRequires: fdupes %description @@ -141,13 +140,5 @@ %{_libdir}/%{name}*.so %{_libdir}/pkgconfig/* %{_datadir}/qt4/mkspecs/features/quill.prf -# %package doc -# Summary: Documentation for libquill -# Group: System/Libraries -# %description doc -# %{summary}. -# %files doc -# %defattr(-,root,root,-) -# %doc %{_datadir}/doc/%{name}/html/ # << files devel other changes: -------------- ++++++ libquill.yaml --- libquill.yaml +++ libquill.yaml @@ -14,8 +14,6 @@ memory-optimized handling of large images, transparent thumbnail handling and non-destructive editing. -PkgBR: - - fdupes PkgConfigBR: - quillimagefilter - quillmetadata submit: Project:MTF:UX / python-imaging -> CE:UX:MTF / python-imaging changes files: -------------- ++++++ new changes file: --- python-imaging.changes +++ python-imaging.changes @@ -0,0 +1,171 @@ +* Sat May 16 2009 Anas Nashif <[email protected]> - 1.1.6 +- Initial import into Moblin + +* Thu Feb 26 2009 Fedora Release Engineering <[email protected]> - 1.1.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sat Nov 29 2008 Ignacio Vazquez-Abrams <[email protected]> - 1.1.6-13 +- Rebuild for Python 2.6 + +* Thu Oct 2 2008 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-12 +- all patches are applied with -p1 + +* Thu Oct 2 2008 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-11 +- rebuild to avoid the patches fuzziness (#464984) + +* Tue Jun 3 2008 Joel Granados <[email protected]> - 1.1.6-10 +- Fix the build. + +* Tue Feb 19 2008 Fedora Release Engineering <[email protected]> - 1.1.6-9 +- Autorebuild for GCC 4.3 + +* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.6-8 +- Egg for PIL library is already in subdirectory, and found by glob. + +* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.6-7 +- python_sitelib -> python_sitearch + +* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.6-6 +- Support for Python Eggs for F9+ + +* Thu Jan 3 2008 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-5 +- Rebuild for Tcl/Tk upgrade (F9+). +- Update description to reflect the subpackages. +- Fix files permission. + +* Tue Aug 28 2007 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-4 +- Rebuild for devel (F8). + +* Sun Apr 29 2007 Nils Philippsen <[email protected]> - 1.1.6-3 +- add sane subpackage, split off tk subpackage (#238252) +- add sane-types patch +- use -b for patches to save original files +- correct groups + +* Wed Feb 14 2007 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-2 +- Rebuild for Tcl/Tk downgrade (F7) + +* Mon Feb 5 2007 José Matos <jamatos[AT]fc.up.pt> - 1.1.6-1 +- New upstream version. +- Clean spec file and specify license as BSD. + +* Tue Dec 12 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-7 +- Rebuild for python 2.5. + +* Tue Aug 29 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-6 +- Rebuild for FE6 +- Clean package, no need for python-abi requirement and ghost pyo files + +* Thu Apr 6 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-5 +- Rebuild because of #187739 + +* Tue Apr 4 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-4 +- Rebuild + +* Tue Apr 4 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-3 +- Restore gif transparency patch. (bug #187875) + +* Sun Apr 2 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-2 +- Fix bug #185203 (Thanks to Rick L Vinyard Jr) + +* Sun Mar 5 2006 José Matos <jamatos[AT]fc.up.pt> - 1.1.5-1 +- Update to 1.1.5 + +* Sun May 22 2005 Jeremy Katz <[email protected]> - 1.1.4-9 +- rebuild on all arches + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Mon Feb 7 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.1.4-7 +- Build PIC on x86_64 to fix x86_64 linking. + +* Sat Oct 9 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.1.4-6 +- Borrow parts from patch in Debian's 1.1.4-3 to fix issues in bug 1038 as + well as a bunch of others. +- Bring up to date with current fedora.us Python spec template recommendations. +- Fix -devel directory permissions. + +* Sun Nov 30 2003 Juha Ylitalo <[email protected]> - 0:1.1.4-0.fdr.5 +- added -devel package (thanks to patch from [email protected]) +- FC1 requires dependency to tcl-devel and tk-devel package + +* Wed Jul 16 2003 Juha Ylitalo <[email protected]> - 0:1.1.4-0.fdr.4 +- bumped release +- implemented changes from Ville, which basically means that: +- setup macro now users "-q" option +- libpng dropped from buildrequirements +- run test suite after build + +* Sat Jul 12 2003 Juha Ylitalo <[email protected]> - 0:1.1.4-0.fdr.3 +- fixed source0 to point into effbot.org instead of pythonware.com +- changed references from python2 to python, since python in RH9 is + python 2.2. +- removed percent signs from changelog. + +* Tue Jul 08 2003 Juha Ylitalo <[email protected]> - 0:1.1.4-0.fdr.2 +- added XFree86-devel and tkinter into buildrequires. +- removed version info from buildrequires +- removed unnecessary stuff from requires. + +* Wed Jun 23 2003 Juha Ylitalo <[email protected]> - 0:1.1.4-0.fdr.1 +- new upstream version + +* Tue May 20 2003 Juha Ylitalo <[email protected]> - 0:1.1.3-0.fdr.5 +- added python2-devel into buildrequires. +- added versionm variable into setup macro instead of hard coded + version number. + +* Mon May 12 2003 Juha Ylitalo <[email protected]> - 0:1.1.3-0.fdr.4 +- removed unnecessary ./configure +- /usr/lib -> _libdir macro +- smp flags to make + +* Sat May 03 2003 Juha Ylitalo <[email protected]> - 0:1.1.3-0.fdr.3 +- changed buildroot macro back to $RP_BUILD_ROOT +- ./configure to configure macro +- Group to Development/Languages +- Added Epoch values to versioned Requires and BuildRequires +- added README and CHANGES-113 into doc + +* Wed Mar 26 2003 Juha Ylitalo <[email protected]> - 0:1.1.3-0.fdr.2 +- added Epoch +- added URL into Source0 +- replaced $RPM_BUILD_ROOT with buildroot macro + +* Wed Mar 26 2003 Juha Ylitalo <[email protected]> - 0:1.1.3-0.fdr.1 +- modified spec file to fit with fedora guidelines. + +* Mon Sep 23 2002 Juha Ylitalo <[email protected]> - 1.1.3-1 +- updated to 1.1.3 +- switched from python 1.5.2 to python 2.2 +- other modifications to make it build at minimal effort + +* Tue Sep 12 2000 Ray Garcia <[email protected]> +- update to 1.1 + +* Thu Mar 30 2000 Frederic Lepied <[email protected]> 1.0b1-3mdk +- group fix. + +* Mon Jan 10 2000 Lenny Cartier <[email protected]> +- build for oxygen +- deactivate provinding of tkinter lib since Chmouel one's works perfectly + +* Mon Dec 27 1999 Lenny Cartier <[email protected]> +- new in contribs +- bz2 archive + +* Mon Jan 11 1999 Oliver Andrich <[email protected]> +- upgraded to Imaging 1.0b1 + +* Sun Dec 27 1998 Oliver Andrich <[email protected]> +- changed Setup file so that the tkinter module is compiled with Tix and BLT + support + +* Mon Jul 20 1998 Oliver Andrich <[email protected]> +- had to recompile and update the package to support the uptodate graphics + libs + +* Sat Jun 07 1998 Oliver Andrich <[email protected]> +- updated package to version 0.3a4 + new: ---- Imaging-1.1.6.tar.gz python-imaging-1.1.6-sane-types.patch python-imaging-giftrans.patch python-imaging-lib64.patch python-imaging-no-xv.patch python-imaging.changes python-imaging.spec spec files: ----------- ++++++ new spec file: --- python-imaging.spec +++ python-imaging.spec @@ -0,0 +1,116 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%define pyver %(%{__python} -c "import sys ; print sys.version[:3]") +%define py_incdir %{_includedir}/python%{pyver} + +Summary: Python's own image processing library +Name: python-imaging +Version: 1.1.6 +Release: 14 + +License: BSD +Group: System/Libraries + +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch +Patch1: %{name}-lib64.patch +Patch2: %{name}-giftrans.patch +Patch3: %{name}-1.1.6-sane-types.patch +URL: http://www.pythonware.com/products/pil/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel + +%description +Python Imaging Library + +The Python Imaging Library (PIL) adds image processing capabilities +to your Python interpreter. + +This library provides extensive file format support, an efficient +internal representation, and powerful image processing capabilities. + +Notice that in order to reduce the package dependencies there are +three subpackages: devel (for development); tk (to interact with the +tk interface) and sane (scanning devices interface). + +%package devel +Summary: Development files for python-imaging +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, python-devel +Requires: libjpeg-devel +Requires: zlib-devel + +%description devel +Development files for python-imaging. + + +%prep +%setup -q -n Imaging-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -b .sane-types + +# fix the interpreter path for Scripts/*.py +cd Scripts +for scr in *.py +do + sed -e "s|/usr/local/bin/python|%{_bindir}/python|" $scr > tmp.py + mv tmp.py $scr + chmod 755 $scr +done + +%build +# Is this still relevant? (It was used in 1.1.4) +#%ifarch x86_64 +# CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ +#%endif + +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build + + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/%{py_incdir}/Imaging +install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging +%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT + + +# There is no need to ship the binaries since they are already packaged +# in %doc +rm -rf $RPM_BUILD_ROOT%{_bindir} + +# Separate files that need Tk and files that don't +echo '%%defattr (0644,root,root,755)' > files.main +p="$PWD" + +pushd $RPM_BUILD_ROOT%{python_sitearch}/PIL +for file in *; do + case "$file" in + *) + what=files.main + ;; + esac + echo %{python_sitearch}/PIL/$file >> "$p/$what" +done +popd + + +%check +PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files -f files.main +%defattr (-,root,root,-) +%doc README CHANGES +%{python_sitearch}/PIL.pth +%dir %{python_sitearch}/PIL + +%files devel +%defattr (0644,root,root,755) +%{py_incdir}/Imaging +%doc Docs Scripts Images + other changes: -------------- ++++++ Imaging-1.1.6.tar.gz (new) ++++++ python-imaging-1.1.6-sane-types.patch (new) --- python-imaging-1.1.6-sane-types.patch +++ python-imaging-1.1.6-sane-types.patch @@ -0,0 +1,13 @@ +--- Imaging-1.1.6/Sane/_sane.c.types 2006-12-03 13:12:22.000000000 +0100 ++++ Imaging-1.1.6/Sane/_sane.c 2007-04-28 11:41:19.000000000 +0200 +@@ -1152,8 +1152,8 @@ + static PyObject * + PySane_get_devices(PyObject *self, PyObject *args) + { +- SANE_Device **devlist; +- SANE_Device *dev; ++ const SANE_Device **devlist; ++ const SANE_Device *dev; + SANE_Status st; + PyObject *list; + int local_only, i; ++++++ python-imaging-giftrans.patch (new) --- python-imaging-giftrans.patch +++ python-imaging-giftrans.patch @@ -0,0 +1,14 @@ +--- Imaging-1.1.6.orig/PIL/GifImagePlugin.py 2006-12-03 11:37:15.000000000 +0000 ++++ Imaging-1.1.6/PIL/GifImagePlugin.py 2008-10-02 14:51:43.000000000 +0100 +@@ -352,6 +352,11 @@ + for i in range(maxcolor): + s.append(chr(i) * 3) + ++ if im.info.has_key('transparency'): ++ transparentIndex = im.info['transparency'] ++ s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) + ++ chr(transparentIndex) + chr(0)) ++ + return s + + def getdata(im, offset = (0, 0), **params): ++++++ python-imaging-lib64.patch (new) --- python-imaging-lib64.patch +++ python-imaging-lib64.patch @@ -0,0 +1,10 @@ +--- Imaging-1.1.6.orig/setup.py 2006-12-03 11:37:29.000000000 +0000 ++++ Imaging-1.1.6/setup.py 2008-10-02 14:51:43.000000000 +0100 +@@ -196,6 +196,7 @@ + add_directory(library_dirs, "/usr/local/lib") + add_directory(include_dirs, "/usr/local/include") + ++ add_directory(library_dirs, "/usr/lib64") + add_directory(library_dirs, "/usr/lib") + add_directory(include_dirs, "/usr/include") + ++++++ python-imaging-no-xv.patch (new) --- python-imaging-no-xv.patch +++ python-imaging-no-xv.patch @@ -0,0 +1,14 @@ +--- Imaging-1.1.6.orig/PIL/Image.py 2006-12-03 12:08:22.000000000 +0000 ++++ Imaging-1.1.6/PIL/Image.py 2008-10-02 14:51:43.000000000 +0100 +@@ -2065,9 +2065,7 @@ + else: + format = None + if not command: +- command = "xv" +- if title: +- command = command + " -name \"%s\"" % title ++ command = "eog" + + if image.mode == "I;16": + # @PIL88 @PIL101 + submit: Project:MTF:UX / quillimagefilter -> CE:UX:MTF / quillimagefilter changes files: -------------- --- quillimagefilter.changes +++ quillimagefilter.changes @@ -0,0 +1,3 @@ +* Thu Feb 09 2012 Marko Saukko <[email protected]> - 1.111202.0 +- Move unittests to tests package. + spec files: ----------- --- quillimagefilter.spec +++ quillimagefilter.spec @@ -35,6 +35,8 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: testrunner-lite +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig %description tests A Qt based library which contains individual image loading, processing @@ -108,7 +110,9 @@ +%post tests -p /sbin/ldconfig +%postun tests -p /sbin/ldconfig @@ -119,7 +123,7 @@ %files %defattr(-,root,root,-) # >> files -%{_libdir}/*.so.* +%{_libdir}/libquillimagefilter.so.* %{_libdir}/qt4/plugins/quillimagefilters/*.so # << files @@ -127,6 +131,7 @@ %files tests %defattr(-,root,root,-) # >> files tests +%{_libdir}/libut_unittests.so* %{_libdir}/quillimagefilter-tests/* %{_datadir}/quillimagefilter-tests/* # << files tests @@ -142,7 +147,7 @@ %defattr(-,root,root,-) # >> files devel %{_includedir}/* -%{_libdir}/*.so +%{_libdir}/libquillimagefilter*.so %{_libdir}/pkgconfig/quillimagefilter.pc %{_datadir}/qt4/mkspecs/features/quillimagefilter.prf # << files devel other changes: -------------- submit: Project:MTF:UX / tumbler -> CE:UX:MTF / tumbler changes files: -------------- --- tumbler.changes +++ tumbler.changes @@ -0,0 +1,4 @@ +* Tue Feb 02 2012 Marko Saukko <[email protected]> - 0.1.22-1meego2 +- Updated to version 0.1.22-1meego2 from meego tree to get the quill plugin. +- Fixes NEMO#76: Added flavors.conf file to get wallpaper applet thumbnails visible. + old: ---- Makefile tumbler-0.1.22.tar.bz2 new: ---- 0002-Replace-python2.6-calls-with-python-calls.patch flavors.conf maemo-af-tumbler-meego_0.1.22-1meego2.tar.gz tumbler-0.1.22-remove-gtk.patch tumbler-no-werror-with-debug.patch spec files: ----------- --- tumbler.spec +++ tumbler.spec @@ -11,23 +11,31 @@ Release: 1 Group: Applications/System License: GPLv2+ -URL: http://www.xfce.org -Source0: http://archive.xfce.org/src/apps/tumbler/0.1/tumbler-%{version}.tar.bz2 +URL: https://maemo.gitorious.org/maemo-af/tumbler +Source0: maemo-af-tumbler-meego_0.1.22-1meego2.tar.gz +Source1: flavors.conf Source100: tumbler.yaml Patch0: 0001-Add-a-x-huge-thumbnail-size-512x512.patch -Patch1: 0003-fix-tumblerd-segmentfault-error.patch +Patch1: 0002-Add-GStreamer-based-thumbnailer-for-video-thumbnails.patch +Patch2: 0003-fix-tumblerd-segmentfault-error.patch +Patch3: tumbler-0.1.22-remove-gtk.patch +Patch4: 0002-Replace-python2.6-calls-with-python-calls.patch +Patch5: tumbler-no-werror-with-debug.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -BuildRequires: pkgconfig(libpng) +BuildRequires: pkgconfig(quillimagefilter) BuildRequires: pkgconfig(glib-2.0) >= 2.16.0 BuildRequires: pkgconfig(gio-2.0) >= 2.16.0 BuildRequires: pkgconfig(gthread-2.0) >= 2.16.0 BuildRequires: pkgconfig(dbus-1) >= 1.0.0 BuildRequires: pkgconfig(dbus-glib-1) >= 0.72 -BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: gettext BuildRequires: intltool BuildRequires: libjpeg-devel +BuildRequires: python +BuildRequires: python-imaging +BuildRequires: dbus-python +BuildRequires: pygobject2 %description @@ -42,25 +50,49 @@ %description devel Development files for %{name} +%package tests +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +%description tests +Development files for %{name} + %prep -%setup -q -n %{name}-%{version} +%setup -q -n maemo-af-%{name} # 0001-Add-a-x-huge-thumbnail-size-512x512.patch %patch0 -p1 -# 0003-fix-tumblerd-segmentfault-error.patch +# 0002-Add-GStreamer-based-thumbnailer-for-video-thumbnails.patch %patch1 -p1 +# 0003-fix-tumblerd-segmentfault-error.patch +%patch2 -p1 +# tumbler-0.1.22-remove-gtk.patch +%patch3 -p1 +# 0002-Replace-python2.6-calls-with-python-calls.patch +%patch4 -p1 +# tumbler-no-werror-with-debug.patch +%patch5 -p1 # >> setup # << setup %build # >> build pre # Force autotools to run because we patched the configure script -autoconf && automake +intltoolize --force --copy --automake +autoreconf -v -f -i -I m4 # << build pre -%configure --disable-static +%configure --disable-static \ + --disable-pixbuf-thumbnailer \ + --disable-font-thumbnailer \ + --enable-quill-thumbnailer \ + --disable-xdg-cache \ + --disable-jpeg-thumbnailer \ + --disable-ffmpeg-thumbnailer \ + --disable-poppler-thumbnailer + make %{?jobs:-j%jobs} # >> build post @@ -70,6 +102,9 @@ # >> install pre # << install pre %make_install +mkdir -p %{buildroot}%{_sysconfdir}/xdg/thumbnails/ +cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/thumbnails/ + # >> install post rm -rf %{buildroot}/%{_datadir}/gtk-doc/ @@ -90,9 +125,10 @@ %{_datadir}/dbus-1/services/org.xfce.Tumbler.Cache1.service %{_datadir}/dbus-1/services/org.xfce.Tumbler.Thumbnailer1.service %{_libdir}/libtumbler-1.so.* -#%{_libdir}/tumbler-1/plugins/tumbler*.so -#%{_libdir}/tumbler-1/plugins/cache/tumbler*.so +%{_libdir}/tumbler-1/plugins/tumbler*.so +%{_libdir}/tumbler-1/plugins/cache/tumbler*.so %{_libdir}/tumbler-1/tumblerd +%{_sysconfdir}/xdg/thumbnails/*.conf # << files %files devel @@ -100,7 +136,13 @@ # >> files devel %{_includedir}/tumbler-* %{_libdir}/libtumbler-1.so -%{_libdir}/pkgconfig +%{_libdir}/pkgconfig/*.pc # << files devel +%files tests +%defattr(-,root,root,-) +# >> files tests +%{_datadir}/tumbler-tests/* +# << files tests + other changes: -------------- ++++++ 0002-Replace-python2.6-calls-with-python-calls.patch (new) --- 0002-Replace-python2.6-calls-with-python-calls.patch +++ 0002-Replace-python2.6-calls-with-python-calls.patch @@ -0,0 +1,165 @@ +From 54b9288c429162a5851e17d0981d2cda91b4ef1f Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Tue, 7 Feb 2012 22:26:15 +0200 +Subject: [PATCH 2/2] Replace python2.6 calls with python calls. + +--- + tests/Makefile.am | 2 +- + tests/TumblerService/Tumbler.py | 2 +- + tests/TumblerService/__init__.py | 2 +- + tests/TumblerTestTools/FakeThumbnails.py | 2 +- + tests/TumblerTestTools/ImagesHandling.py | 2 +- + tests/TumblerTestTools/Utils.py | 2 +- + tests/TumblerTestTools/__init__.py | 2 +- + tests/generate-tests-xml.py | 2 +- + tests/run-tumbler-unit-tests.py | 2 +- + tests/tumblerCacheUnitTests.py | 2 +- + tests/tumblerFlavorsUnitTests.py | 2 +- + tests/tumblerImageFormatsUnitTests.py | 2 +- + tests/tumblerSchedulersUnitTests.py | 2 +- + tests/tumblerVideoFormatsUnitTests.py | 2 +- + 14 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 7733555..999f07d 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -17,7 +17,7 @@ config_SCRIPTS = \ + testrunner = run-tumbler-unit-tests.py + + tests.xml: ${functional_tests} +- python2.6 generate-tests-xml.py ${testrunner} $@ ${functional_tests} ++ python generate-tests-xml.py ${testrunner} $@ ${functional_tests} + + functional-test: ${functional_tests} + @if test -h /targets/links/scratchbox.config ; then \ +diff --git a/tests/TumblerService/Tumbler.py b/tests/TumblerService/Tumbler.py +index ab48641..6acd2f9 100644 +--- a/tests/TumblerService/Tumbler.py ++++ b/tests/TumblerService/Tumbler.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import dbus +diff --git a/tests/TumblerService/__init__.py b/tests/TumblerService/__init__.py +index dd5a4ce..ec69c5c 100644 +--- a/tests/TumblerService/__init__.py ++++ b/tests/TumblerService/__init__.py +@@ -1,2 +1,2 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- +\ No newline at end of file +diff --git a/tests/TumblerTestTools/FakeThumbnails.py b/tests/TumblerTestTools/FakeThumbnails.py +index 39022eb..d6f4994 100644 +--- a/tests/TumblerTestTools/FakeThumbnails.py ++++ b/tests/TumblerTestTools/FakeThumbnails.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + from Utils import * +diff --git a/tests/TumblerTestTools/ImagesHandling.py b/tests/TumblerTestTools/ImagesHandling.py +index 9a3f1e5..7958ed4 100644 +--- a/tests/TumblerTestTools/ImagesHandling.py ++++ b/tests/TumblerTestTools/ImagesHandling.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + # + # You need to have PIL installed to make it working: +diff --git a/tests/TumblerTestTools/Utils.py b/tests/TumblerTestTools/Utils.py +index 449b713..ffc0937 100644 +--- a/tests/TumblerTestTools/Utils.py ++++ b/tests/TumblerTestTools/Utils.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import hashlib +diff --git a/tests/TumblerTestTools/__init__.py b/tests/TumblerTestTools/__init__.py +index 5879329..836e3e8 100644 +--- a/tests/TumblerTestTools/__init__.py ++++ b/tests/TumblerTestTools/__init__.py +@@ -1,2 +1,2 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- +diff --git a/tests/generate-tests-xml.py b/tests/generate-tests-xml.py +index d6b691f..7a73985 100755 +--- a/tests/generate-tests-xml.py ++++ b/tests/generate-tests-xml.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + + import inspect + import os, sys, re +diff --git a/tests/run-tumbler-unit-tests.py b/tests/run-tumbler-unit-tests.py +index d19266c..11869d1 100755 +--- a/tests/run-tumbler-unit-tests.py ++++ b/tests/run-tumbler-unit-tests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import unittest +diff --git a/tests/tumblerCacheUnitTests.py b/tests/tumblerCacheUnitTests.py +index 0c1de44..82d33a1 100755 +--- a/tests/tumblerCacheUnitTests.py ++++ b/tests/tumblerCacheUnitTests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import unittest +diff --git a/tests/tumblerFlavorsUnitTests.py b/tests/tumblerFlavorsUnitTests.py +index 92fc073..4555c6f 100755 +--- a/tests/tumblerFlavorsUnitTests.py ++++ b/tests/tumblerFlavorsUnitTests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import unittest +diff --git a/tests/tumblerImageFormatsUnitTests.py b/tests/tumblerImageFormatsUnitTests.py +index 82ab3ea..659ee90 100755 +--- a/tests/tumblerImageFormatsUnitTests.py ++++ b/tests/tumblerImageFormatsUnitTests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import unittest +diff --git a/tests/tumblerSchedulersUnitTests.py b/tests/tumblerSchedulersUnitTests.py +index fa06103..d01bfb8 100755 +--- a/tests/tumblerSchedulersUnitTests.py ++++ b/tests/tumblerSchedulersUnitTests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import unittest +diff --git a/tests/tumblerVideoFormatsUnitTests.py b/tests/tumblerVideoFormatsUnitTests.py +index 51b60e5..3b3d848 100755 +--- a/tests/tumblerVideoFormatsUnitTests.py ++++ b/tests/tumblerVideoFormatsUnitTests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.6 ++#!/usr/bin/python + # -*- coding: utf-8 -*- + + import unittest +-- +1.7.6.5 + ++++++ flavors.conf (new) --- flavors.conf +++ flavors.conf @@ -0,0 +1,15 @@ +[normal] +Name=normal +Width=100 +Height=100 + + +# Primary use is landscape mode grids. Scaled to 170x170, cropped. +[grid] +Name=grid +Width=170 +Height=170 +MinimumWidth=170 +MinimumHeight=170 +FrameSelectionPolicy=First + ++++++ maemo-af-tumbler-meego_0.1.22-1meego2.tar.gz (new) ++++++ tumbler-0.1.22-remove-gtk.patch (new) --- tumbler-0.1.22-remove-gtk.patch +++ tumbler-0.1.22-remove-gtk.patch @@ -0,0 +1,54 @@ +From e9a97d2d0be2d306a0865b2db664e7808e81293b Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Tue, 7 Feb 2012 22:24:47 +0200 +Subject: [PATCH 1/2] Remove docs. + +--- + Makefile.am | 5 +---- + configure.ac | 9 --------- + 2 files changed, 1 insertions(+), 13 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index a7b305f..580a496 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,8 +22,5 @@ SUBDIRS = \ + tumbler \ + plugins \ + tumblerd \ +- tests \ +- docs ++ tests + +-DISTCHECK_CONFIGURE_FLAGS = \ +- --enable-gtk-doc +diff --git a/configure.ac b/configure.ac +index 0f50c5c..6548911 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -123,11 +123,6 @@ dnl ****************************** + linguas=`ls po/*.po | sed s/.po//g | sed sApo/AA | xargs` + XDT_I18N([$linguas]) + +-dnl ************************* +-dnl *** Check for GTK-Doc *** +-dnl ************************* +-GTK_DOC_CHECK(1.9) +- + dnl *********************************** + dnl *** Check for dbus-binding-tool *** + dnl *********************************** +@@ -177,10 +172,6 @@ AC_SUBST([GTK_DOC_EXTRA_CFLAGS]) + + AC_OUTPUT([ + Makefile +-docs/Makefile +-docs/reference/Makefile +-docs/reference/tumbler/Makefile +-docs/reference/tumbler/version.xml + plugins/Makefile + plugins/font-thumbnailer/Makefile + plugins/jpeg-thumbnailer/Makefile +-- +1.7.6.5 + ++++++ tumbler-no-werror-with-debug.patch (new) --- tumbler-no-werror-with-debug.patch +++ tumbler-no-werror-with-debug.patch @@ -0,0 +1,22 @@ +diff --git a/m4/xdt-features.m4 b/m4/xdt-features.m4 +index ea0c685..1859f1c 100644 +--- a/m4/xdt-features.m4 ++++ b/m4/xdt-features.m4 +@@ -84,7 +84,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]), + + if test x"$enable_debug" = x"full"; then + AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) +- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror" ++ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3" + CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + AC_MSG_RESULT([full]) + else +@@ -134,7 +134,7 @@ AC_DEFUN([XDT_FEATURE_VISIBILITY], + [enable_visibility=$enableval], [enable_visibility=yes]) + have_gnuc_visibility=no + if test "x$enable_visibility" != "xno"; then +- XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Werror -Wno-unused-parameter]) ++ XDT_SUPPORTED_FLAGS([xdt_vis_test_cflags], [-Wall -Wno-unused-parameter]) + saved_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $xdt_vis_test_cflags" + AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) ++++++ tumbler.yaml --- tumbler.yaml +++ tumbler.yaml @@ -4,39 +4,49 @@ Release: 1 Group: Applications/System License: GPLv2+ -URL: http://www.xfce.org +URL: https://maemo.gitorious.org/maemo-af/tumbler Description: | Tumbler is a D-Bus service for applications to request thumbnails for various URI schemes and MIME types -Sources: - - http://archive.xfce.org/src/apps/tumbler/0.1/tumbler-%{version}.tar.bz2 +Sources: + - maemo-af-tumbler-meego_0.1.22-1meego2.tar.gz +ExtraSources: + - flavors.conf;%{_sysconfdir}/xdg/thumbnails/ Patches: - 0001-Add-a-x-huge-thumbnail-size-512x512.patch + - 0002-Add-GStreamer-based-thumbnailer-for-video-thumbnails.patch - 0003-fix-tumblerd-segmentfault-error.patch -LocaleName: tumbler + - tumbler-0.1.22-remove-gtk.patch + - 0002-Replace-python2.6-calls-with-python-calls.patch + - tumbler-no-werror-with-debug.patch PkgBR: - gettext - intltool - libjpeg-devel + # For test build. + - python + - python-imaging + - dbus-python + - pygobject2 PkgConfigBR: - - libpng + - quillimagefilter - glib-2.0 >= 2.16.0 - gio-2.0 >= 2.16.0 - gthread-2.0 >= 2.16.0 - dbus-1 >= 1.0.0 - dbus-glib-1 >= 0.72 -# - gdk-pixbuf-2.0 >= 2.14 - - gstreamer-0.10 +# - gstreamer-0.10 Configure: configure -# ConfigOptions: -# - --enable-gtk-doc-html +ConfigOptions: + - --disable-pixbuf-thumbnailer + - --disable-font-thumbnailer + - --enable-quill-thumbnailer + - --disable-xdg-cache + - --disable-jpeg-thumbnailer + - --disable-ffmpeg-thumbnailer + - --disable-poppler-thumbnailer +# - --enable-debug=full AutoSubPackages: - devel -# SubPackages: -# - Name: doc -# Group: Documentation -# Summary: API reference for tumbler -# Files: -# - %{_datadir}/gtk-doc/html/tumbler - + - tests ++++++ deleted files: --- Makefile --- tumbler-0.1.22.tar.bz2
