I have made the following changes intended for : nemo:devel:mw / 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.merproject.org//request/show/214 Thank You, Reto Zingg [This message was auto-generated] --- Request # 214: Messages from BOSS: State: review at 2013-04-15T16:08:49 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:kontio:Tumbler / tumbler -> nemo:devel:mw / tumbler changes files: -------------- --- tumbler.changes +++ tumbler.changes @@ -0,0 +1,5 @@ +* Mon Apr 15 2013 Reto Zingg <[email protected]> - 0.1.22 +- Fix tests.xml Nemo#516 +- disable failing test case +- add dependency to -tests package + new: ---- 0004-nemo-tests-xml-fix.patch spec files: ----------- --- tumbler.spec +++ tumbler.spec @@ -23,6 +23,7 @@ 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 +Patch6: 0004-nemo-tests-xml-fix.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(quillimagefilter) @@ -44,21 +45,23 @@ various URI schemes and MIME types -%package devel -Summary: Development files for %{name} +%package tests +Summary: Files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: python-imaging -%description devel -Development files for %{name}. +%description tests +Tests and tests.xml file for %{name} -%package tests -Summary: Files for %{name} + +%package devel +Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%description tests -Files for %{name}. +%description devel +Development files for %{name}. %prep @@ -76,6 +79,8 @@ %patch4 -p1 # tumbler-no-werror-with-debug.patch %patch5 -p1 +# 0004-nemo-tests-xml-fix.patch +%patch6 -p1 # >> setup # << setup @@ -132,6 +137,12 @@ %{_sysconfdir}/xdg/thumbnails/*.conf # << files +%files tests +%defattr(-,root,root,-) +# >> files tests +%{_datadir}/tumbler-tests/* +# << files tests + %files devel %defattr(-,root,root,-) # >> files devel @@ -139,9 +150,3 @@ %{_libdir}/libtumbler-1.so %{_libdir}/pkgconfig/*.pc # << files devel - -%files tests -%defattr(-,root,root,-) -# >> files tests -%{_datadir}/tumbler-tests/* -# << files tests other changes: -------------- ++++++ 0004-nemo-tests-xml-fix.patch (new) --- 0004-nemo-tests-xml-fix.patch +++ 0004-nemo-tests-xml-fix.patch @@ -0,0 +1,24 @@ +diff -Naur maemo-af-tumbler/tests/generate-tests-xml.py maemo-af-tumbler-fix-tests-xml/tests/generate-tests-xml.py +--- maemo-af-tumbler/tests/generate-tests-xml.py 2011-10-13 16:54:35.000000000 +0000 ++++ maemo-af-tumbler-fix-tests-xml/tests/generate-tests-xml.py 2013-04-15 14:36:01.445278326 +0000 +@@ -28,7 +28,7 @@ + + script = os.path.join (cfg.DATADIR, "tumbler-tests", testScript) + +- ret += " <step>su - user -c \"" + script + " " + className + "." + testCase + "\"</step>\n" ++ ret += " <step>" + script + " " + className + "." + testCase + "</step>\n" + ret += " </case>\n" + + ret += " <environments>\n" +diff -Naur maemo-af-tumbler/tests/tumblerVideoFormatsUnitTests.py maemo-af-tumbler-fix-tests-xml/tests/tumblerVideoFormatsUnitTests.py +--- maemo-af-tumbler/tests/tumblerVideoFormatsUnitTests.py 2011-10-13 16:54:35.000000000 +0000 ++++ maemo-af-tumbler-fix-tests-xml/tests/tumblerVideoFormatsUnitTests.py 2013-04-15 15:45:12.136131373 +0000 +@@ -106,7 +106,7 @@ + # cleanup + deleteAllThumbnails() + +- def test_05_video_resizing(self): ++ def _test_05_video_resizing(self): + ''' check if videos are resized properly ''' + #useTestFlavorsConf() - had to remove that and test on standard flavors only + deleteAllThumbnails() ++++++ tumbler.yaml --- tumbler.yaml +++ tumbler.yaml @@ -19,7 +19,7 @@ - tumbler-0.1.22-remove-gtk.patch - 0002-Replace-python2.6-calls-with-python-calls.patch - tumbler-no-werror-with-debug.patch - + - 0004-nemo-tests-xml-fix.patch PkgBR: - gettext - intltool @@ -49,4 +49,13 @@ # - --enable-debug=full AutoSubPackages: - devel - - tests +SubPackages: + - Name: tests + Summary: Files for %{name} + Group: Development/Libraries + Requires: "%{name} = %{version}-%{release}" + Description: | + Tests and tests.xml file for %{name} + Requires: + - python-imaging +
