Hello community, here is the log from the commit of package pitivi for openSUSE:12.2 checked in at 2012-07-04 22:22:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/pitivi (Old) and /work/SRC/openSUSE:12.2/.pitivi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pitivi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/pitivi/pitivi.changes 2012-06-25 15:50:19.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.pitivi.new/pitivi.changes 2012-07-04 22:22:10.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Jul 4 14:52:44 UTC 2012 - [email protected] + +- Add pitivi-help_figures.patch: Fix an encoding error in the + distributed Makefile.am and Makefile.in and change + mainwindow.png to mainwindow.jpg. +- Add codecscontainers.jpg as source. Due to the encoding error + addressed by above patch, this file was not present in the + tarball. +- Add mainwindow.jpg as source: upstream accidentally references + a .png file in the makefiles, but the real file is a .jpg. + +------------------------------------------------------------------- New: ---- codecscontainers.jpg mainwindow.jpg pitivi-help_figures.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pitivi.spec ++++++ --- /var/tmp/diff_new_pack.7b9uuw/_old 2012-07-04 22:22:10.000000000 +0200 +++ /var/tmp/diff_new_pack.7b9uuw/_new 2012-07-04 22:22:10.000000000 +0200 @@ -24,6 +24,11 @@ Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.pitivi.org/ Source: http://download.gnome.org/sources/pitivi/0.15/%{name}-%{version}.tar.xz +# Imported frmo git tree. Due to a character error in Makefile.am, this file was missnig frmo the tarball. +Source1: codecscontainers.jpg +Source2: mainwindow.jpg +# PATCH-FIX-UPSTREAM pitivi-help_figures.patch bgo#679397 [email protected] -- Fix a weird issue in help/Makefile.am +Patch0: pitivi-help_figures.patch BuildRequires: fdupes BuildRequires: gnome-doc-utils-devel >= 0.18.0 BuildRequires: hicolor-icon-theme @@ -60,6 +65,11 @@ %lang_package %prep %setup -q +# Test if the file is in the tarball again. +test ! -f help/C/figures/codecscontainers.jpg +test ! -f help/C/figures/mainwindow.jpg +cp %{S:1} %{S:2} help/C/figures/ +%patch0 -p1 translation-update-upstream %build ++++++ pitivi-help_figures.patch ++++++ diff -ur pitivi-0.15.2/help/Makefile.am pitivi-0.15.2.patch/help/Makefile.am --- pitivi-0.15.2/help/Makefile.am 2012-05-03 15:25:42.000000000 +0200 +++ pitivi-0.15.2.patch/help/Makefile.am 2012-07-04 16:58:35.308200825 +0200 @@ -4,7 +4,7 @@ DOC_ID = pitivi DOC_FIGURES = \ - figures/codecscontainers.jpg \ + figures/codecscontainers.jpg\ figures/fadestep1.png \ figures/fadestep2.png \ figures/fadestep3.png \ @@ -13,7 +13,7 @@ figures/keyframecurves.png \ figures/layers.png \ figures/logo.png \ - figures/mainwindow.png \ + figures/mainwindow.jpg \ figures/previewsource.png \ figures/ripple-after.png \ figures/ripple-before.png \ diff -ur pitivi-0.15.2/help/Makefile.in pitivi-0.15.2.patch/help/Makefile.in --- pitivi-0.15.2/help/Makefile.in 2012-05-03 16:51:10.000000000 +0200 +++ pitivi-0.15.2.patch/help/Makefile.in 2012-07-04 16:58:44.277016583 +0200 @@ -327,7 +327,7 @@ _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) DOC_ID = pitivi DOC_FIGURES = \ - figures/codecscontainers.jpg \ + figures/codecscontainers.jpg\ figures/fadestep1.png \ figures/fadestep2.png \ figures/fadestep3.png \ @@ -336,7 +336,7 @@ figures/keyframecurves.png \ figures/layers.png \ figures/logo.png \ - figures/mainwindow.png \ + figures/mainwindow.jpg \ figures/previewsource.png \ figures/ripple-after.png \ figures/ripple-before.png \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
