From 7879ca8167a813f88dc51ffe2ba4a2bb646a1f82 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 28 Feb 2010 10:55:03 +0000 Subject: [PATCH] Fix #270 --- gpac.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gpac.spec b/gpac.spec index c8e2c12..59d83c0 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,7 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global cvs 20100116 +%global cvs 20090919 %global with_osmo 0 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 @@ -32,6 +32,9 @@ Patch2: gpac-0.4.5-amr.patch Patch3: gpac-0.4.5-lib64.patch Patch4: gpac-0.4.5-system_openjpeg.patch Patch5: gpac-0.4.6-js_cflags.patch +Patch6: gpac-0.4.5-shared_sggen.patch +#https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853856&group_id=84101 +Patch7: gpac-0.4.6-libxml2.patch #https://sourceforge.net/tracker/?func=detail&atid=571740&aid=2853857&group_id=84101 Patch9: gpac-0.4.6-ffmpeg.patch Patch10: gpac-0.4.6-ogl_libs.patch @@ -156,6 +159,8 @@ web browsers. %endif %patch4 -p1 -b .openjpeg %patch5 -p1 -b .jscflags +%patch6 -p1 -b .shared +%patch7 -p1 -b .libxml2 %patch9 -p1 -b .ffmpeg %patch10 -p1 -b .ogl_libs @@ -277,6 +282,7 @@ done #Fix doxygen timestamp touch -r Changelog doc/html/* +touch -r Changelog $RPM_BUILD_ROOT%{_incluedir}/gpac/configuration.h %clean @@ -332,10 +338,8 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Jan 16 2010 Nicolas Chauvet - 0.4.6-0.3cvs20100116 -- Update to 20100116 -- Removed upstreamed patch for system libxml2 -- Update ffmpeg patch +* Sat Feb 27 2010 Nicolas Chauvet - 0.4.6-0.3cvs20090919 +- New Attempt to fix rfbz#270 * Tue Nov 3 2009 kwizart < kwizart at gmail.com > - 0.4.6-0.2cvs20090919 - Attempt to fix rfbz#270