From 395d4456752cdc258f410152a2b9d2b66d487403fc78a0cd2326c00f35a4b054 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 20 Feb 2012 10:36:53 +0000 Subject: [PATCH 1/3] Accepting request 105975 from home:pbleser:branches:multimedia:apps add conditional BUILD_ORIG_ADDON to buildrequire ffmpeg-devel and enable ffmpeg fingerprinting support when picard is linked and built on Packman OBS-URL: https://build.opensuse.org/request/show/105975 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/picard?expand=0&rev=18 --- picard.changes | 6 ++++++ picard.spec | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/picard.changes b/picard.changes index c2e45e4..3b44167 100644 --- a/picard.changes +++ b/picard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/picard.spec b/picard.spec index 4238cd4..4b807f9 100644 --- a/picard.spec +++ b/picard.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Name: picard Version: 0.15.1 Release: 1 Summary: The Next Generation MusicBrainz Tagger -License: GPLv2+ +License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities Url: http://musicbrainz.org/doc/PicardTagger Source0: http://ftp.musicbrainz.org/pub/musicbrainz/picard/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ Source16: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollect Source17: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?BUILD_ORIG_ADDON:1} +BuildRequires: ffmpeg-devel +%endif BuildRequires: desktop-file-utils gcc-c++ libofa-devel python-devel BuildRequires: libdiscid-devel %if 0%{?suse_version} From 753434d03f7e4324386ef9145ae2815e479aed73e7fbb9c429b23a798b228632 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Tue, 21 Feb 2012 11:14:04 +0000 Subject: [PATCH 2/3] - Ran spec-cleaner OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/picard?expand=0&rev=19 --- picard.changes | 5 +++++ picard.spec | 53 ++++++++++++++++++++++---------------------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/picard.changes b/picard.changes index 3b44167..d061aae 100644 --- a/picard.changes +++ b/picard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/picard.spec b/picard.spec index 4b807f9..c61f1dc 100644 --- a/picard.spec +++ b/picard.spec @@ -15,12 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: picard Version: 0.15.1 -Release: 1 +Release: 0 Summary: The Next Generation MusicBrainz Tagger License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Utilities @@ -40,28 +38,33 @@ Source14: http://users.musicbrainz.org/~brianfreud/SearchGoogle3.py Source15: http://users.musicbrainz.org/~brianfreud/SearchLortelArchives3.py Source16: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollector3.py Source17: http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py -BuildRoot: %{_tmppath}/%{name}-%{version}-build - %if 0%{?BUILD_ORIG_ADDON:1} BuildRequires: ffmpeg-devel %endif -BuildRequires: desktop-file-utils gcc-c++ libofa-devel python-devel +BuildRequires: desktop-file-utils +BuildRequires: gcc-c++ BuildRequires: libdiscid-devel +BuildRequires: libofa-devel +BuildRequires: python-devel %if 0%{?suse_version} -%py_requires -BuildRequires: hicolor-icon-theme python-mutagen python-qt4 update-desktop-files +BuildRequires: hicolor-icon-theme +BuildRequires: python-mutagen +BuildRequires: python-qt4 +BuildRequires: update-desktop-files Requires: python-mutagen +%py_requires %endif %if 0%{?fedora} -BuildRequires: PyQt4 python-mutagen +BuildRequires: PyQt4 +BuildRequires: python-mutagen Requires: python-mutagen %endif %if 0%{?mandriva_version} BuildRequires: python-qt4 %endif - -%{!?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)} +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_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 Requires: python-ctypes %endif @@ -72,19 +75,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 tagging and cross platform compatibility. - -Authors: -------- - Lukáš Lalinský - Robert Kaye - - %lang_package %prep %setup -q %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" cat > %{name}_libdiscid_dummy.c <<-EOF #include #include @@ -100,14 +96,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 if diff -u picard/disc.py~ picard/disc.py ; then : ; fi # -%{__python} setup.py config -%{__python} setup.py build +python setup.py config +python setup.py build %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 -PLUGINDIR=$RPM_BUILD_ROOT%{py_sitedir}/picard/plugins/ +PLUGINDIR=%{buildroot}%{py_sitedir}/picard/plugins/ install -m 0644 %{SOURCE1} ${PLUGINDIR} install -m 0644 %{SOURCE2} ${PLUGINDIR} install -m 0644 %{SOURCE5} ${PLUGINDIR} @@ -124,7 +120,7 @@ install -m 0644 %{SOURCE17} ${PLUGINDIR} %if 0%{?fedora} 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 %if 0%{?suse_version} %suse_update_desktop_file -G "Music Tagger" -N "picard" picard @@ -132,11 +128,8 @@ desktop-file-install --delete-original --remove-category="Application" \ %find_lang %{name} -mkdir -vp $RPM_BUILD_ROOT/%{_libdir}/%{name} -cp -avL %{name}_libdiscid_dummy $RPM_BUILD_ROOT/%{_libdir}/%{name} - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -vp %{buildroot}/%{_libdir}/%{name} +cp -avL %{name}_libdiscid_dummy %{buildroot}/%{_libdir}/%{name} %if 0%{?mandriva_version} > 2006 From acb038a8d8fdc94ad241c7fbe775b0b9fd5a6322396a86b9c21fbe663898bb4b Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 23 Feb 2012 11:06:28 +0000 Subject: [PATCH 3/3] Accepting request 106623 from home:ralflangb1:branches:multimedia:apps - add a requires: on python-qt4. picard will not run without this OBS-URL: https://build.opensuse.org/request/show/106623 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/picard?expand=0&rev=20 --- picard.changes | 5 +++++ picard.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/picard.changes b/picard.changes index d061aae..599a3eb 100644 --- a/picard.changes +++ b/picard.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 23 10:34:30 UTC 2012 - Ralf Lang + +- add a requires: on python-qt4. picard will not run without this + ------------------------------------------------------------------- Tue Feb 21 11:14:04 UTC 2012 - saschpe@suse.de diff --git a/picard.spec b/picard.spec index c61f1dc..cb95df0 100644 --- a/picard.spec +++ b/picard.spec @@ -16,6 +16,7 @@ # + Name: picard Version: 0.15.1 Release: 0 @@ -52,6 +53,7 @@ BuildRequires: python-mutagen BuildRequires: python-qt4 BuildRequires: update-desktop-files Requires: python-mutagen +Requires: python-qt4 %py_requires %endif %if 0%{?fedora}