Accepting request 106626 from multimedia:apps

- add a requires: on python-qt4. picard will not run without this (forwarded request 106623 from ralflangb1)

OBS-URL: https://build.opensuse.org/request/show/106626
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/picard?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2012-02-24 05:53:17 +00:00 committed by Git OBS Bridge
commit 8678fee360
2 changed files with 44 additions and 30 deletions

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Feb 23 10:34:30 UTC 2012 - Ralf Lang <lang@b1-systems.de>
- add a requires: on python-qt4. picard will not run without this
-------------------------------------------------------------------
Tue Feb 21 11:14:04 UTC 2012 - saschpe@suse.de
- Ran spec-cleaner
-------------------------------------------------------------------
Mon Feb 20 09:45:40 UTC 2012 - pascal.bleser@opensuse.org
- add conditional BUILD_ORIG_ADDON to buildrequire ffmpeg-devel and enable
ffmpeg fingerprinting support when picard is linked and built on Packman
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 1 08:25:44 CEST 2011 - ohering@suse.de Mon Aug 1 08:25:44 CEST 2011 - ohering@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package picard # spec file for package picard
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,12 +15,11 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
Name: picard Name: picard
Version: 0.15.1 Version: 0.15.1
Release: 1 Release: 0
Summary: The Next Generation MusicBrainz Tagger Summary: The Next Generation MusicBrainz Tagger
License: GPL-2.0+ License: GPL-2.0+
Group: Productivity/Multimedia/Sound/Utilities Group: Productivity/Multimedia/Sound/Utilities
@ -40,25 +39,34 @@ Source14: http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py
Source15: http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py Source15: http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py
Source16: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py Source16: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py
Source17: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py Source17: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?BUILD_ORIG_ADDON:1}
BuildRequires: ffmpeg-devel
BuildRequires: desktop-file-utils gcc-c++ libofa-devel python-devel %endif
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: libdiscid-devel BuildRequires: libdiscid-devel
BuildRequires: libofa-devel
BuildRequires: python-devel
%if 0%{?suse_version} %if 0%{?suse_version}
%py_requires BuildRequires: hicolor-icon-theme
BuildRequires: hicolor-icon-theme python-mutagen python-qt4 update-desktop-files BuildRequires: python-mutagen
BuildRequires: python-qt4
BuildRequires: update-desktop-files
Requires: python-mutagen Requires: python-mutagen
Requires: python-qt4
%py_requires
%endif %endif
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: PyQt4 python-mutagen BuildRequires: PyQt4
BuildRequires: python-mutagen
Requires: python-mutagen Requires: python-mutagen
%endif %endif
%if 0%{?mandriva_version} %if 0%{?mandriva_version}
BuildRequires: python-qt4 BuildRequires: python-qt4
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{!?py_sitedir: %define py_sitedir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %{!?py_sitedir: %define py_sitedir %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?py_ver_int: %define py_ver_int %(%{__python} -c "import sys; v=sys.version_info[:2]; print '%%d%%d'%%v" 2>/dev/null)} %{!?py_ver_int: %define py_ver_int %(python -c "import sys; v=sys.version_info[:2]; print '%%d%%d'%%v" 2>/dev/null)}
%if 0%{?py_ver_int} == 24 %if 0%{?py_ver_int} == 24
Requires: python-ctypes Requires: python-ctypes
%endif %endif
@ -69,19 +77,12 @@ Python. Picard Tagger is intended to be the next generation of tagger for
MusicBrainz, with a focus on album oriented tagging as opposed to track based MusicBrainz, with a focus on album oriented tagging as opposed to track based
tagging and cross platform compatibility. tagging and cross platform compatibility.
Authors:
-------
Lukáš Lalinský <lalinsky@gmail.com>
Robert Kaye <rob@eorbit.net>
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%build %build
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="%{optflags}"
cat > %{name}_libdiscid_dummy.c <<-EOF cat > %{name}_libdiscid_dummy.c <<-EOF
#include <stdio.h> #include <stdio.h>
#include <discid/discid.h> #include <discid/discid.h>
@ -97,14 +98,14 @@ libdiscid_so="`readelf --wide --dynamic picard_libdiscid_dummy | sed -n '/(NEEDE
sed -i~ -e "s@^\([[:blank:]]\+\)\(libName[[:blank:]]*=[[:blank:]]*'\)\(libdiscid.so.0\)\('[[:blank:]]*\)@\1\2${libdiscid_so}\4 # was '\3'@" picard/disc.py sed -i~ -e "s@^\([[:blank:]]\+\)\(libName[[:blank:]]*=[[:blank:]]*'\)\(libdiscid.so.0\)\('[[:blank:]]*\)@\1\2${libdiscid_so}\4 # was '\3'@" picard/disc.py
if diff -u picard/disc.py~ picard/disc.py ; then : ; fi if diff -u picard/disc.py~ picard/disc.py ; then : ; fi
# #
%{__python} setup.py config python setup.py config
%{__python} setup.py build python setup.py build
%install %install
%{__python} setup.py install --skip-build --prefix=%{_prefix} --root=$RPM_BUILD_ROOT python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
# install plugins # install plugins
PLUGINDIR=$RPM_BUILD_ROOT%{py_sitedir}/picard/plugins/ PLUGINDIR=%{buildroot}%{py_sitedir}/picard/plugins/
install -m 0644 %{SOURCE1} ${PLUGINDIR} install -m 0644 %{SOURCE1} ${PLUGINDIR}
install -m 0644 %{SOURCE2} ${PLUGINDIR} install -m 0644 %{SOURCE2} ${PLUGINDIR}
install -m 0644 %{SOURCE5} ${PLUGINDIR} install -m 0644 %{SOURCE5} ${PLUGINDIR}
@ -121,7 +122,7 @@ install -m 0644 %{SOURCE17} ${PLUGINDIR}
%if 0%{?fedora} %if 0%{?fedora}
desktop-file-install --delete-original --remove-category="Application" \ desktop-file-install --delete-original --remove-category="Application" \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/applications/%{name}.desktop
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%suse_update_desktop_file -G "Music Tagger" -N "picard" picard %suse_update_desktop_file -G "Music Tagger" -N "picard" picard
@ -129,11 +130,8 @@ desktop-file-install --delete-original --remove-category="Application" \
%find_lang %{name} %find_lang %{name}
mkdir -vp $RPM_BUILD_ROOT/%{_libdir}/%{name} mkdir -vp %{buildroot}/%{_libdir}/%{name}
cp -avL %{name}_libdiscid_dummy $RPM_BUILD_ROOT/%{_libdir}/%{name} cp -avL %{name}_libdiscid_dummy %{buildroot}/%{_libdir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%if 0%{?mandriva_version} > 2006 %if 0%{?mandriva_version} > 2006