From f92d8fdf0a68f745971b3052858fdb22e55699f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Mon, 15 Sep 2014 04:18:03 +0000
Subject: [PATCH] =?UTF-8?q?*=20Mon=20Sep=2015=202014=20S=C3=A9rgio=20Basto?=
 =?UTF-8?q?=20<sergio@serjux.com>=20-=200.5.0-11.20140915svn=20-=20Update?=
 =?UTF-8?q?=20to=2020140915=20-=20Some=20clean=20ups,=20fix=20location=20o?=
 =?UTF-8?q?f=20html=20files.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore |  2 +-
 gpac.spec  | 26 +++++++++++---------------
 sources    |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8e74bcd..555a5af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-gpac-20130914.tar.xz
+gpac-20140915.tar.xz
diff --git a/gpac.spec b/gpac.spec
index 06e1294..538255c 100644
--- a/gpac.spec
+++ b/gpac.spec
@@ -7,7 +7,7 @@
 #        - Fix unused-direct-shlib-dependency on libgpac
 
 %global osmo          Osmo4
-%global svn           20130914
+%global svn           20140915
 # Mozilla stuff fails. It's completely disabled for now.
 %global mozver        3.0
 %global geckover      2.0.0
@@ -17,14 +17,13 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.5.0
-Release:     10%{?svn:.%{svn}svn}%{?dist}
+Release:     11%{?svn:.%{svn}svn}%{?dist}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
 #Source0:     http://downloads.sourceforge.net/gpac/gpac-%{version}.tar.gz
 Source0:     gpac-%{svn}.tar.xz
 Source9:     gpac-snapshot.sh
-BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
 
 BuildRequires:  ImageMagick
 BuildRequires:  SDL-devel
@@ -52,7 +51,7 @@ BuildRequires:  libXv-devel
 BuildRequires:  wxGTK-devel
 BuildRequires:  xmlrpc-c-devel
 %{?_with_mozilla:BuildRequires: gecko-devel}
-BuildRequires:  doxygen
+BuildRequires:  doxygen graphviz
 BuildRequires:  desktop-file-utils
 %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
 BuildRequires:  gtk+-devel
@@ -192,11 +191,8 @@ popd
 #  install
 }
 
-# Parallele build will fail
-make all
-#{?_smp_mflags}
-make sggen
-#{?_smp_mflags}
+make %{?_smp_mflags} all 
+make %{?_smp_mflags} sggen
 
 ## kwizart - build doxygen doc for devel
 pushd doc
@@ -204,7 +200,6 @@ doxygen
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install install-lib INSTFLAGS="-p"
 
 %{?_with_mozilla:
@@ -252,7 +247,7 @@ for b in MPEG4 X3D; do
 done
 
 #Fix doxygen timestamp
-touch -r Changelog doc/html/*
+touch -r Changelog doc/html-libgpac/*
 
 #config.h like but not only
 #Usual multilib bug https://bugzilla.rpmfusion.org/show_bug.cgi?id=270
@@ -263,9 +258,6 @@ touch -r Changelog $RPM_BUILD_ROOT%{_includedir}/gpac/modules/*.h
 rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -306,7 +298,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%doc doc/html/*
+%doc doc/html-libgpac/*
 
 %files devel
 %defattr(-,root,root,-)
@@ -320,6 +312,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 15 2014 Sérgio Basto <sergio@serjux.com> - 0.5.0-11.20140915svn
+- Update to 20140915
+- Some clean ups, fix location of html files.
+
 * Thu Aug 07 2014 Sérgio Basto <sergio@serjux.com> - 0.5.0-10.20130914svn
 - Rebuilt for ffmpeg-2.3
 
diff --git a/sources b/sources
index 913b4e7..86e9e47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-448b52e8ae09355685b61a3767b83e56  gpac-20130914.tar.xz
+4e3d305fa9a21deed48659316fbbe619  gpac-20140915.tar.xz