Author: kwizart Update of /cvs/free/rpms/python-vlc/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25117/F-13 Modified Files: .cvsignore python-vlc-snapshot.sh python-vlc.spec sources Log Message: Resync python-vlc to the vlc 1.1.x branch Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/python-vlc/F-13/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jun 2009 20:07:31 -0000 1.2 +++ .cvsignore 5 Aug 2010 16:20:59 -0000 1.3 @@ -1 +1 @@ -python-vlc-1.0.0.90.tar.gz +python-vlc-1.1.0-20100706git.tar.bz2 Index: python-vlc-snapshot.sh =================================================================== RCS file: /cvs/free/rpms/python-vlc/F-13/python-vlc-snapshot.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-vlc-snapshot.sh 22 Jun 2009 20:07:31 -0000 1.1 +++ python-vlc-snapshot.sh 5 Aug 2010 16:20:59 -0000 1.2 @@ -16,18 +16,11 @@ name=python-vlc pushd "$tmp" > /dev/null -# Because git sucks, we download the entire vlc tree: -git clone git://git.videolan.org/vlc.git -pushd vlc > /dev/null -git checkout origin/1.0-bugfix -pushd bindings/python/ > /dev/null -python setup.py sdist -pushd dist > /dev/null -for file in *.tar.gz; do -mv $file "$pwd"/ +git clone git://git.videolan.org/vlc/bindings/python.git +version=$(cat python/setup.py |grep version|sed -e "s|.*= '||" -e "s|',||") +mv python $name-$version +rm -fr $name-$version/.git +file=$name-$version-"$sdate"git.tar.bz2 +tar jcvf "$pwd"/$file $name-$version/ echo "Wrote: " $file -done -popd > /dev/null -popd > /dev/null -popd > /dev/null popd > /dev/null Index: python-vlc.spec =================================================================== RCS file: /cvs/free/rpms/python-vlc/F-13/python-vlc.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-vlc.spec 22 Jun 2009 20:07:31 -0000 1.1 +++ python-vlc.spec 5 Aug 2010 16:20:59 -0000 1.2 @@ -1,49 +1,55 @@ -%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%endif -%global ver_min .90 +%global gitdate 20100706git Name: python-vlc -Version: 1.0.0 -Release: 0.2%{ver_min}%{?dist} +Version: 1.1.0 +Release: 1.%{gitdate}%{?dist} Summary: VLC Media Player binding for Python Group: Applications/Multimedia License: GPLv2+ URL: http://www.videolan.org/ -Source0: %{name}-%{version}%{ver_min}.tar.gz +Source0: %{name}-%{version}-%{gitdate}.tar.bz2 Source9: %{name}-snapshot.sh BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: python-devel -BuildRequires: python-setuptools -BuildRequires: vlc-devel +BuildArch: noarch +BuildRequires: python2-devel +Requires: vlc-core >= 1.1.0 %description This package provides a python interface to control VLC Media Player. %prep -%setup -q -n %{name}-%{version}%{ver_min} +%setup -q %build -CFLAGS="$RPM_OPT_FLAGS" python -c 'import setuptools; execfile("setup.py")' build +# The vlc.py file is already generated %install rm -rf $RPM_BUILD_ROOT -python -c 'import setuptools; execfile("setup.py")' install --skip-build --root $RPM_BUILD_ROOT +sleep 1m +mkdir -p $RPM_BUILD_ROOT%{python_sitelib} +install -pm 755 generated/vlc.py vlcwidget.py \ + $RPM_BUILD_ROOT%{python_sitelib}/ -# Correct the permission of the script -chmod +x $RPM_BUILD_ROOT%{python_sitearch}/vlcwidget.py - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README -%{python_sitearch}/*egg-info -%{python_sitearch}/vlc.so -%{python_sitearch}/vlcwidget.py* +%doc README TODO +%{python_sitelib}/vlc.py* +%{python_sitelib}/vlcwidget.py* %changelog +* Tue Jul 06 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.1.0-1.20100706git +- 1.1.0 final updates + +* Tue May 11 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.1.0-0.1.20100511git +- Update to 1.1.0 (git checkout) + * Fri Jun 19 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1.0.0-0.2.90 - Remove COPYING file Index: sources =================================================================== RCS file: /cvs/free/rpms/python-vlc/F-13/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jun 2009 20:07:31 -0000 1.2 +++ sources 5 Aug 2010 16:20:59 -0000 1.3 @@ -1 +1 @@ -4e6aa58b6b54bcd460f9a3985656379d python-vlc-1.0.0.90.tar.gz +37f4eeae38106ca770f542a3cd57c7a6 python-vlc-1.1.0-20100706git.tar.bz2