[python-vlc] Add git tag to version.

commit 34cce40bc70129a689fe21ef113c125e58a1b6a1 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Oct 1 06:24:53 2016 +0100 Add git tag to version. - Update to 1.1.2-20161001git5d389c7 - Update python snippets. .gitignore | 1 + python-vlc-snapshot.sh | 5 ++++- python-vlc.spec | 37 ++++++++++++++++++++++--------------- sources | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-) --- diff --git a/.gitignore b/.gitignore index d7199d3..b6944ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ python-vlc-1.1.0-20141115git.tar.bz2 +/python-vlc-1.1.2-20161001git5d389c7.tar.bz2 diff --git a/python-vlc-snapshot.sh b/python-vlc-snapshot.sh index 274b235..8251973 100644 --- a/python-vlc-snapshot.sh +++ b/python-vlc-snapshot.sh @@ -18,9 +18,12 @@ name=python-vlc pushd "$tmp" > /dev/null git clone git://git.videolan.org/vlc/bindings/python.git version=$(cat python/setup.py |grep version|sed -e "s|.*= '||" -e "s|',||") +pushd python +tag=$(git rev-list HEAD -n 1 | cut -c 1-7) +popd mv python $name-$version rm -fr $name-$version/.git -file=$name-$version-"$sdate"git.tar.bz2 +file=$name-$version-"$sdate"git"$tag".tar.bz2 tar jcvf "$pwd"/$file $name-$version/ echo "Wrote: " $file popd > /dev/null diff --git a/python-vlc.spec b/python-vlc.spec index 4e0970b..44871f9 100644 --- a/python-vlc.spec +++ b/python-vlc.spec @@ -1,18 +1,17 @@ -# [Fedora] Turn off the brp-python-bytecompile script +# [Fedora] Turn off the brp-python-bytecompile script %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%global gitdate 20141115git +%global gitdate 20161001git5d389c7 Name: python-vlc -Version: 1.1.0 -Release: 9.%{gitdate}%{?dist} +Version: 1.1.2 +Release: 1.%{gitdate}%{?dist} Summary: VLC Media Player binding for Python Group: Applications/Multimedia License: GPLv2+ URL: http://www.videolan.org/ Source0: %{name}-%{version}-%{gitdate}.tar.bz2 Source9: %{name}-snapshot.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python2-devel Requires: vlc-core >= 1.1.0 @@ -25,29 +24,37 @@ This package provides a python interface to control VLC Media Player. %build # The vlc.py file is already generated +%py2_build %install -mkdir -p $RPM_BUILD_ROOT%{python_sitelib} -install -pm 755 generated/vlc.py \ - $RPM_BUILD_ROOT%{python_sitelib}/ -mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/examples +%py2_install + +mkdir -p %{buildroot}%{_datadir}/%{name}/examples install -pm 755 examples/* \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/examples/ + %{buildroot}%{_datadir}/%{name}/examples/ +#fix rpmlint +chmod +x %{buildroot}%{python2_sitelib}/*py %check -./test.py || : +%{__python2} setup.py test + %files -%doc README TODO -%{python_sitelib}/vlc.py* +%doc README.rst TODO +%{python2_sitelib}/vlc.py* +%{python2_sitelib}/*egg-info %{_datadir}/%{name}/ %changelog +* Sat Oct 01 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.2-1.20161001git5d389c7 +- Add git tag to version. +- Update to 1.1.2-20161001git5d389c7 +- Update python snippets. + * Mon Aug 01 2016 Sérgio Basto <sergio(a)serjux.com&gt; - 1.1.0-9.20141115git -- - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_... +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_... * Sat Nov 15 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.0-8.20120503git - Update to today's snapshot diff --git a/sources b/sources index 8bc0020..8e99381 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8bd3277f2f9254eb6f131948dd5f0185 python-vlc-1.1.0-20141115git.tar.bz2 +fd400903c457fbcf6f2fa75542821aca python-vlc-1.1.2-20161001git5d389c7.tar.bz2