diff --git a/.gitignore b/.gitignore index e9f4d4f..ac7b99c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -x264-stable-20120909.tar.bz2 +x264-stable-20121006-68dfb7b.tar.bz2 diff --git a/sources b/sources index 1390710..cbabb79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8cf985a5c6dc213d01a26af79153156 x264-stable-20120909.tar.bz2 +bf71d1de57328c53e42af7d0429eeb0e x264-stable-20121006-68dfb7b.tar.bz2 diff --git a/x264-snapshot.sh b/x264-snapshot.sh index 8493b76..fdb4ca8 100755 --- a/x264-snapshot.sh +++ b/x264-snapshot.sh @@ -20,10 +20,11 @@ commit=HEAD pushd "$tmp" git clone git://git.videolan.org/${package}.git -b ${branch} cd ${package} +tag=$(git rev-list HEAD -n 1 | cut -c 1-7) git checkout ${commit} git checkout -b rpmfusion ./version.sh > version.h git add version.h git commit -m "generated version.h" version.h -git archive --prefix="${package}-${branch}-${date}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2 +git archive --prefix="${package}-${branch}-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-${branch}-${date}-${tag}.tar.bz2 popd >/dev/null diff --git a/x264.spec b/x264.spec index 4865bfa..d444880 100644 --- a/x264.spec +++ b/x264.spec @@ -1,5 +1,8 @@ -%global snapshot 20120909 -%global branch stable +%global gitdate 20121006 +%global gitversion 68dfb7b +%global snapshot %{gitdate}-%{gitversion} +%global gver .%{gitdate}git%{gitversion} +%global branch stable #global _with_bootstrap 1 @@ -20,7 +23,7 @@ Summary: H264/AVC video streams encoder Name: x264 Version: 0.125 -Release: 4.%{snapshot}%{?dist} +Release: 5%{?gver}%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://developers.videolan.org/x264.html @@ -65,7 +68,7 @@ scratch. This package contains the development files. -%define x_configure \ +%global x_configure \ ./configure \\\ --prefix=%{_prefix} \\\ --exec-prefix=%{_exec_prefix} \\\ @@ -186,6 +189,12 @@ touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_incl %{_libdir}/libx26410b.so %changelog +* Sat Oct 06 2012 Sérgio Basto - 0.125-4.20121006git68dfb7b +- Note: no source update. +- Just add git tag to package name, for faster check upstream. +- Add git tag in x264-snapshot.sh . +- Convert all defines in global. + * Sun Sep 09 2012 Sérgio Basto - 0.125-4.20120909 - unbootstrap on F18.