From 5fd59ed8291776d01845aa8e936d49baa358e47e0db61ae4add703e7b34c8610 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Sep 2015 06:40:54 +0000 Subject: [PATCH] Accepting request 328698 from home:wolfi323:branches:multimedia:libs Modify vlc-2.1.5-fix-skins2-default-skin-creation.patch to patch Makefile.am instead of Makefile.in: autoreconf overwrote the change, making the patch totally ineffective and thus the default skin was broken OBS-URL: https://build.opensuse.org/request/show/328698 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=137 --- vlc-2.1.5-fix-skins2-default-skin-creation.patch | 10 +++++----- vlc.changes | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/vlc-2.1.5-fix-skins2-default-skin-creation.patch b/vlc-2.1.5-fix-skins2-default-skin-creation.patch index dd20b28..317ab25 100644 --- a/vlc-2.1.5-fix-skins2-default-skin-creation.patch +++ b/vlc-2.1.5-fix-skins2-default-skin-creation.patch @@ -5,11 +5,11 @@ New tar defaults create PAX archives which have two problems: * they contain atime and thus the build time Avoid this by passign "--format=ustar" to tar when creating skins2/default.vlt -Index: b/share/Makefile.in +Index: b/share/Makefile.am =================================================================== ---- a/share/Makefile.in -+++ b/share/Makefile.in -@@ -1757,7 +1757,7 @@ skins2/default.vlt: $(skins2_default_vlt +--- a/share/Makefile.am ++++ b/share/Makefile.am +@@ -79,7 +79,7 @@ skins2/default.vlt: $(skins2_default_vlt mkdir -p skins2 (cd "$(srcdir)/skins2"; find default -print0 | \ LC_ALL=C sort -z | \ @@ -17,4 +17,4 @@ Index: b/share/Makefile.in + tar cvv --format=ustar --exclude .svn --no-recursion --null -T -) | \ gzip -n > skins2/default.vlt - .lua.luac: + # diff --git a/vlc.changes b/vlc.changes index a459051..c47c1a7 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Sep 2 20:10:21 UTC 2015 - wbauer@tmo.at + +- Modify vlc-2.1.5-fix-skins2-default-skin-creation.patch to patch + Makefile.am instead of Makefile.in: autoreconf overwrote the + change, making the patch totally ineffective and thus the default + skin was broken + ------------------------------------------------------------------- Fri Jul 24 12:28:32 UTC 2015 - dimstar@opensuse.org