update to 3.11.5, patch out appdata validation (as no config option was added)

This commit is contained in:
Adam Williamson 2014-02-05 23:51:53 -08:00
parent 7515496e03
commit 680c8a30c1
2 changed files with 58 additions and 4 deletions

View File

@ -0,0 +1,49 @@
diff --git a/Makefile.am b/Makefile.am
index ce5b933..d0f98e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,12 +37,7 @@
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
DIST_SUBDIRS = $(NORMAL_SUBDIRS) browser-plugin
-DISTCHECK_CONFIGURE_FLAGS = \
- --disable-scrollkeeper \
- --enable-gtk-doc \
- --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' \
- --enable-introspection \
- --enable-appdata-validate
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' --enable-vala=no --enable-introspection
# Build ChangeLog from GIT history
ChangeLog:
diff --git a/configure.ac b/configure.ac
index 3dcfc7c..4ec1ec4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -602,8 +602,6 @@ GNOME_CXX_WARNINGS
GNOME_MAINTAINER_MODE_DEFINES
GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-APPDATA_XML
-
# This macro expands DIR and assigns it to RET.
# If DIR is NONE, then it's replaced by DEFAULT.
# Based on AC_DEFINE_DIR
diff --git a/data/appdata/Makefile.am b/data/appdata/Makefile.am
index b6e6823..d82e59b 100644
--- a/data/appdata/Makefile.am
+++ b/data/appdata/Makefile.am
@@ -1,9 +1,7 @@
# AppData
-@APPDATA_XML_RULES@
@INTLTOOL_XML_RULE@
-
+appdatadir = $(datadir)/appdata
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
appdata_in_files = totem.appdata.xml.in
-appdata_XML = $(appdata_in_files:.xml.in=.xml)
-
-EXTRA_DIST = $(appdata_in_files)
-CLEANFILES = $(appdata_XML)
+EXTRA_DIST = $(appdata_in_files})
+CLEANFILES = $(appdata_DATA)

View File

@ -7,6 +7,9 @@ License: GPLv2+ with exceptions
Group: Applications/Multimedia
URL: http://projects.gnome.org/totem/
Source0: http://download.gnome.org/sources/totem/3.11/totem-%{version}.tar.xz
# Needed as --disable-appdata-validate wasn't actually implemented upstream
# This is a reversion of upstream "build: Enable validation of the AppData file"
Patch0: totem-3.11.5-disable_appdata_validation.patch
Requires: gnome-icon-theme
# For the opensubtitles plugin
@ -64,7 +67,7 @@ BuildRequires: grilo-devel >= 0.2.0
BuildRequires: zeitgeist-devel
BuildRequires: gnome-common
BuildRequires: autoconf automake intltool
BuildRequires: autoconf automake intltool gtk-doc
# The mythtv sub-package was removed
# (obsoleted by -upnp then by grilo in main)
@ -152,9 +155,11 @@ audio and video files in the properties dialog.
%prep
%setup -q
%patch0 -p1
%build
./autogen.sh
export BROWSER_PLUGIN_DIR=%{_libdir}/mozilla/plugins
%configure \
--enable-browser-plugins \
@ -209,10 +214,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_bindir}/%{name}-audio-preview
%{_libdir}/libtotem.so.*
%{_libdir}/girepository-1.0/Totem-1.0.typelib
%{_datadir}/appdata/totem.appdata.xml
%{_datadir}/applications/%{name}.desktop
%dir %{_datadir}/totem
%{_datadir}/totem/*.png
%{_datadir}/totem/fullscreen.ui
%{_datadir}/totem/controls.ui
%{_datadir}/totem/org_gnome_totem_PluginViewer.xml
%{_datadir}/totem/playlist.ui
%{_datadir}/totem/preferences.ui
%{_datadir}/totem/properties.ui
@ -229,7 +236,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_libdir}/totem/plugins/chapters
%{_libdir}/totem/plugins/dbus
%{_libdir}/totem/plugins/gromit
%{_libdir}/totem/plugins/grilo
%{_libdir}/totem/plugins/im-status
%{_libdir}/totem/plugins/ontop
%{_libdir}/totem/plugins/recent
@ -247,7 +253,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/icons/hicolor/*/apps/totem.png
%{_datadir}/icons/hicolor/*/devices/totem-tv.png
%{_datadir}/icons/hicolor/scalable/devices/totem-tv.svg
%{_datadir}/icons/hicolor/scalable/actions/view-sidebar-symbolic.svg
%{_mandir}/man1/%{name}.1*
%{_mandir}/man1/totem-video-thumbnailer.1.gz
%{_datadir}/GConf/gsettings/*.convert