From fe0f1aca187555422e5bae1db10686158b0d6e54 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 6 Dec 2014 11:08:54 +0000 Subject: [PATCH] Update gpac to lastest svn --- .gitignore | 2 +- gpac-snapshot.sh | 5 +---- gpac.spec | 13 +++++++------ sources | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 555a5af..3f4518a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gpac-20140915.tar.xz +gpac-20141206.tar.xz diff --git a/gpac-snapshot.sh b/gpac-snapshot.sh index 03b3cf4..4f64d7d 100644 --- a/gpac-snapshot.sh +++ b/gpac-snapshot.sh @@ -15,10 +15,7 @@ pwd=$(pwd) svn=$(date +%Y%m%d) cd "$tmp" -svn co http://svn.code.sf.net/p/gpac/code/trunk/gpac gpac -revision=$(svnversion gpac) -echo "#define GPAC_SVN_REVISION \"$revision\"" > gpac/include/gpac/version.h -find gpac -name ".svn" -type d -exec rm -rf {} ';' || : +svn export http://svn.code.sf.net/p/gpac/code/trunk/gpac gpac rm -rf gpac/extra_lib/ tar Jcf "$pwd"/gpac-$svn.tar.xz gpac cd - >/dev/null diff --git a/gpac.spec b/gpac.spec index ddc21a6..2a35b06 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,7 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global svn 20140915 +%global svn 20141206 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 %global geckover 2.0.0 @@ -16,8 +16,8 @@ Name: gpac Summary: MPEG-4 multimedia framework -Version: 0.5.0 -Release: 13%{?svn:.%{svn}svn}%{?dist} +Version: 0.5.1 +Release: 14%{?svn:.%{svn}svn}%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://gpac.sourceforge.net/ @@ -144,9 +144,6 @@ iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt rm -rf doc/ipmpx_syntax.bt.origine -echo "#define GPAC_FULL_VERSION GPAC_SVN_REVISION" >> include/gpac/version.h -echo "#define GPAC_VERSION GPAC_FULL_VERSION" >> include/gpac/version.h - %build %configure \ @@ -312,6 +309,10 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h %changelog +* Sat Dec 06 2014 Nicolas Chauvet - 0.5.1-14.20141206svn +- Update to svn20141206 - last svn rev 5542 +- Fix invalid SONAME - rfbz#3365 + * Sun Oct 19 2014 Sérgio Basto - 0.5.0-13.20140915svn - Rebuilt for FFmpeg 2.4.3 diff --git a/sources b/sources index 86e9e47..800f8b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e3d305fa9a21deed48659316fbbe619 gpac-20140915.tar.xz +8c8bc2951d2c1f63c6251782f4e46251 gpac-20141206.tar.xz