Accepting request 406379 from multimedia:apps

- add recommends for python-discid

OBS-URL: https://build.opensuse.org/request/show/406379
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/picard?expand=0&rev=25
This commit is contained in:
Dominique Leuenberger 2016-07-07 13:10:30 +00:00 committed by Git OBS Bridge
commit c79f265c99
2 changed files with 6 additions and 21 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jun 29 09:56:06 UTC 2016 - hpj@urpla.net
- add recommends for python-discid
-------------------------------------------------------------------
Wed Feb 24 16:03:42 UTC 2016 - olaf@aepfle.de

View File

@ -38,7 +38,6 @@ Source16: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollect
Source17: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
BuildRequires: desktop-file-utils
BuildRequires: gcc-c++
BuildRequires: libdiscid-devel
BuildRequires: libofa-devel
BuildRequires: python-devel
BuildRequires: python-mutagen
@ -46,6 +45,7 @@ Requires: python-mutagen
BuildRequires: hicolor-icon-theme
BuildRequires: python-qt4
BuildRequires: update-desktop-files
Recommends: python-discid
Requires: python-qt4
Recommends: chromaprint-fpcalc
@ -61,22 +61,6 @@ tagging and cross platform compatibility.
%setup -q -n %{name}-release-%{version}
%build
export CFLAGS="%{optflags}"
cat > %{name}_libdiscid_dummy.c <<-EOF
#include <stdio.h>
#include <discid/discid.h>
int main(void) {
printf("Dummy to generate correct libdiscid.so rpm dependency.\n");
discid_free(discid_new());
return 0;
}
EOF
gcc -Wall -s $CFLAGS -o %{name}_libdiscid_dummy %{name}_libdiscid_dummy.c -ldiscid
# there is some upstream confusion about what the SONAME of libdiscid is supposed to be
libdiscid_so="`readelf --wide --dynamic picard_libdiscid_dummy | sed -n '/(NEEDED).*libdiscid.so/s@^\(.*\[\)\([^]]\+\).*@\2@p'`"
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
#
python setup.py config
python setup.py build
@ -105,9 +89,6 @@ rm -rfv %{buildroot}%{_datadir}/locale/sco
%find_lang %{name}-countries %{name}.lang
%find_lang %{name}-attributes %{name}.lang
mkdir -vp %{buildroot}/%{_libdir}/%{name}
cp -avL %{name}_libdiscid_dummy %{buildroot}/%{_libdir}/%{name}
%post
%icon_theme_cache_post
@ -118,7 +99,6 @@ cp -avL %{name}_libdiscid_dummy %{buildroot}/%{_libdir}/%{name}
%defattr(-,root,root)
%doc AUTHORS.txt COPYING.txt NEWS.txt
%{_bindir}/picard
%{_libdir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{python_sitearch}/picard*
%{_datadir}/icons/hicolor/*/apps/picard.png