diff --git a/gpac-snapshot.sh b/gpac-snapshot.sh index 4f64d7d..3e73637 100644 --- a/gpac-snapshot.sh +++ b/gpac-snapshot.sh @@ -1,21 +1,12 @@ -#!/bin/bash +#!/bin/sh set -e -tmp=$(mktemp -d) +DIRNAME=gpac-$(date +%Y%m%d) -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} +git clone --depth 1 https://github.com/gpac/gpac.git ${DIRNAME} -unset CDPATH -pwd=$(pwd) -svn=$(date +%Y%m%d) +rm -rf ${DIRNAME}/.git +rm -rf ${DIRNAME}/extra_lib -cd "$tmp" -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 +tar cJf ${DIRNAME}.tar.xz ${DIRNAME} diff --git a/gpac.spec b/gpac.spec index 2a35b06..192c211 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,7 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global svn 20141206 +#global git 20150924 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 %global geckover 2.0.0 @@ -16,14 +16,14 @@ Name: gpac Summary: MPEG-4 multimedia framework -Version: 0.5.1 -Release: 14%{?svn:.%{svn}svn}%{?dist} +Version: 0.5.2 +Release: 1%{?git:.%{git}git}%{?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 +Source0: https://github.com/gpac/gpac/archive/v%{version}.tar.gz +#Source0: gpac-%{git}.tar.xz +#Source9: gpac-snapshot.sh BuildRequires: ImageMagick BuildRequires: SDL-devel @@ -137,7 +137,7 @@ web browsers. } %prep -%setup -q -n gpac +%setup -q # Fix encoding warnings cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine > doc/ipmpx_syntax.bt @@ -264,6 +264,7 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h %defattr(-,root,root,-) %doc AUTHORS BUGS Changelog COPYING README TODO %{_bindir}/DashCast +%{_bindir}/MP42TS %{_bindir}/MP4Box %{_bindir}/MP4Client %{_bindir}/MPEG4Gen @@ -309,6 +310,9 @@ rm $RPM_BUILD_ROOT%{_includedir}/gpac/config.h %changelog +* Sun Oct 11 2015 Michael Kuhn - 0.5.2-1 +- Update to 0.5.2. + * Sat Dec 06 2014 Nicolas Chauvet - 0.5.1-14.20141206svn - Update to svn20141206 - last svn rev 5542 - Fix invalid SONAME - rfbz#3365