diff --git a/.gitignore b/.gitignore index d1cbeba..d3bcadf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -gpac-20110915.tar.bz2 +gpac-20110923.tar.bz2 diff --git a/gpac-snapshot.sh b/gpac-snapshot.sh index dcc3ae3..ee13008 100644 --- a/gpac-snapshot.sh +++ b/gpac-snapshot.sh @@ -15,7 +15,10 @@ pwd=$(pwd) svn=$(date +%Y%m%d) cd "$tmp" -svn export http://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac +svn co http://gpac.svn.sourceforge.net/svnroot/gpac/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 {} ';' rm -rf gpac/extra_lib/ tar jcf "$pwd"/gpac-$svn.tar.bz2 gpac cd - >/dev/null diff --git a/gpac.spec b/gpac.spec index 1ee8acc..f7ad860 100644 --- a/gpac.spec +++ b/gpac.spec @@ -7,7 +7,7 @@ # - Fix unused-direct-shlib-dependency on libgpac %global osmo Osmo4 -%global cvs 20110915 +%global svn 20110923 # Mozilla stuff fails. It's completely disabled for now. %global mozver 3.0 %global geckover 2.0.0 @@ -17,12 +17,12 @@ Name: gpac Summary: MPEG-4 multimedia framework Version: 0.4.6 -Release: 0.15.svn%{?cvs}%{?dist} +Release: 0.16.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: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{cvs}.tar.bz2 +Source0: http://rpms.kwizart.net/fedora/SOURCE/gpac-%{svn}.tar.bz2 Source9: gpac-snapshot.sh Patch1: gpac-0.4.6_15-soname.patch Patch2: gpac-0.4.5-amr.patch @@ -326,7 +326,11 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Thu Sep 22 2011 Nicolas Chauvet - 0.4.6-0.15cvs20110915 +* Fri Sep 23 2011 Nicolas Chauvet - 0.4.6-0.16svn20110923 +- Update to 20110923 +- Fix svnversion + +* Thu Sep 22 2011 Nicolas Chauvet - 0.4.6-0.15svn20110915 - Update to 20110915 * Thu Jul 14 2011 Nicolas Chauvet - 0.4.6-0.14.cvs20100527 diff --git a/sources b/sources index 657a323..7e11d59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ff3420b29b433d7ff2cf3eb4906149ac gpac-20110915.tar.bz2 +32a1c81119b123d442fa7295d8b77d09 gpac-20110923.tar.bz2