Author: alexlan Update of /cvs/free/rpms/picard-freeworld/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24977/F-9 Modified Files: .cvsignore sources Added Files: picard-freeworld-0.11-avsetup.patch picard-freeworld.spec Log Message: Importing for F-10, F-9 branches. picard-freeworld-0.11-avsetup.patch: --- NEW FILE picard-freeworld-0.11-avsetup.patch --- --- setup.py_orig 2009-01-02 14:13:56.000000000 -0700 +++ setup.py 2009-01-02 14:14:19.000000000 -0700 @@ -370,8 +370,6 @@ if have_pkgconfig: if self.pkgconfig_check_module('avcodec', 'libavcodec libavformat'): include_dirs = cflags_to_include_dirs(cfg.get('avcodec', 'cflags')) - if self.try_compile('#include <avcodec.h>', include_dirs=include_dirs): - cfg.set('avcodec', 'cflags', cfg.get('avcodec', 'cflags') + ' -DUSE_OLD_FFMPEG_LOCATIONS') else: self.check_lib('avcodec', 'av_open_input_file', ['avcodec.h', 'avformat.h'], [['avcodec', 'avformat'], ['avcodec-51', 'avformat-51']]) --- NEW FILE picard-freeworld.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: picard-freeworld Version: 0.11 Release: 4%{?dist} Summary: Acoustic fingerprinting for Picard tagger Group: Applications/Multimedia Source0: http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-%{version}.tar.gz Patch0: %{name}-0.11-avsetup.patch License: GPLv2+ Url: http://musicbrainz.org/doc/PicardTagger BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: PyQt4 >= 4.3 BuildRequires: python-mutagen > 1.9 BuildRequires: libofa-devel BuildRequires: ffmpeg-devel # Require matching main package picard from Fedora Requires: picard = %{version} %description Picard is an audio tagging application using data from the MusicBrainz database. This add-on package supplies the library necessary for acoustic fingerprinting. %prep %setup -q -n picard-%{version} %patch0 -p0 %build env %{__python} setup.py config env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT # remove everything except for {python_sitearch}/picard/musicdns/avcodec.so cp -p $RPM_BUILD_ROOT%{python_sitearch}/picard/musicdns/avcodec.so avcodec.so rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/picard/musicdns/ install -pm 0755 avcodec.so $RPM_BUILD_ROOT%{python_sitearch}/picard/musicdns/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{python_sitearch}/picard/musicdns/avcodec.so %changelog * Wed Jan 14 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.11-4 - Remove check target, only useful in the base picard package. * Fri Jan 2 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.11-3 - Rename to picard-freeworld as per review - Fix cp/install commands - Modified patch by Bob Arendt to skip test for <avcodec.h> * Mon Dec 29 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.11-2 - Initial RPM Fusion package for providing acoustic fingerprinting. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/picard-freeworld/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Jan 2009 17:42:30 -0000 1.1 +++ .cvsignore 16 Jan 2009 03:00:53 -0000 1.2 @@ -0,0 +1 @@ +picard-0.11.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/picard-freeworld/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Jan 2009 17:42:30 -0000 1.1 +++ sources 16 Jan 2009 03:00:53 -0000 1.2 @@ -0,0 +1 @@ +02ddcff3e201b2cf54f1b52b02d44fad picard-0.11.tar.gz