rpms/x264/devel .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 x264-snapshot.sh, 1.4, 1.5 x264.spec, 1.47, 1.48
Author: sergiomb
Update of /cvs/free/rpms/x264/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv3121
Modified Files:
.cvsignore sources x264-snapshot.sh x264.spec
Log Message:
* Sat Oct 06 2012 Sérgio Basto <sergio(a)serjux.com> - 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.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 9 Sep 2012 03:44:38 -0000 1.23
+++ .cvsignore 6 Oct 2012 00:04:51 -0000 1.24
@@ -1 +1 @@
-x264-stable-20120909.tar.bz2
+x264-stable-20121006-68dfb7b.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 9 Sep 2012 03:44:38 -0000 1.23
+++ sources 6 Oct 2012 00:04:51 -0000 1.24
@@ -1 +1 @@
-c8cf985a5c6dc213d01a26af79153156 x264-stable-20120909.tar.bz2
+bf71d1de57328c53e42af7d0429eeb0e x264-stable-20121006-68dfb7b.tar.bz2
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-snapshot.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264-snapshot.sh 24 Aug 2011 15:32:19 -0000 1.4
+++ x264-snapshot.sh 6 Oct 2012 00:04:51 -0000 1.5
@@ -20,10 +20,11 @@
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
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- x264.spec 9 Sep 2012 18:33:30 -0000 1.47
+++ x264.spec 6 Oct 2012 00:04:51 -0000 1.48
@@ -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 @@
This package contains the development files.
-%define x_configure \
+%global x_configure \
./configure \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
@@ -186,6 +189,12 @@
%{_libdir}/libx26410b.so
%changelog
+* Sat Oct 06 2012 Sérgio Basto <sergio(a)serjux.com> - 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 <sergio(a)serjux.com> - 0.125-4.20120909
- unbootstrap on F18.