rpms/gpac/devel gpac.spec,1.13,1.14

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15394

Modified Files:
	gpac.spec 
Log Message:
Fix #270



Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gpac.spec	17 Jan 2010 00:43:58 -0000	1.13
+++ gpac.spec	28 Feb 2010 10:55:03 -0000	1.14
@@ -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 @@
 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 @@
 %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 @@
 
 #Fix doxygen timestamp
 touch -r Changelog doc/html/*
+touch -r Changelog $RPM_BUILD_ROOT%{_incluedir}/gpac/configuration.h
 
 
 %clean
@@ -332,10 +338,8 @@
 
 
 %changelog
-* Sat Jan 16 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 0.4.6-0.3cvs20100116
-- Update to 20100116
-- Removed upstreamed patch for system libxml2
-- Update ffmpeg patch
+* Sat Feb 27 2010 Nicolas Chauvet <kwizart at fedoraproject.org> - 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