Hello community, here is the log from the commit of package picard for openSUSE:Factory checked in at 2012-02-24 06:53:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/picard (Old) and /work/SRC/openSUSE:Factory/.picard.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "picard", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/picard/picard.changes 2011-09-23 12:41:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.picard.new/picard.changes 2012-02-24 06:53:21.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Feb 23 10:34:30 UTC 2012 - Ralf Lang <l...@b1-systems.de> + +- add a requires: on python-qt4. picard will not run without this + +------------------------------------------------------------------- +Tue Feb 21 11:14:04 UTC 2012 - sasc...@suse.de + +- Ran spec-cleaner + +------------------------------------------------------------------- +Mon Feb 20 09:45:40 UTC 2012 - pascal.ble...@opensuse.org + +- add conditional BUILD_ORIG_ADDON to buildrequire ffmpeg-devel and enable + ffmpeg fingerprinting support when picard is linked and built on Packman + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ picard.spec ++++++ --- /var/tmp/diff_new_pack.WW2iBY/_old 2012-02-24 06:53:24.000000000 +0100 +++ /var/tmp/diff_new_pack.WW2iBY/_new 2012-02-24 06:53:24.000000000 +0100 @@ -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 @@ -15,12 +15,11 @@ # 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,25 +39,34 @@ 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 - -BuildRequires: desktop-file-utils gcc-c++ libofa-devel python-devel +%if 0%{?BUILD_ORIG_ADDON:1} +BuildRequires: ffmpeg-devel +%endif +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 +Requires: python-qt4 +%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 @@ -69,19 +77,12 @@ MusicBrainz, with a focus on album oriented tagging as opposed to track based tagging and cross platform compatibility. - -Authors: -------- - Lukáš Lalinský <lalin...@gmail.com> - Robert Kaye <r...@eorbit.net> - - %lang_package %prep %setup -q %build -export CFLAGS="$RPM_OPT_FLAGS" +export CFLAGS="%{optflags}" cat > %{name}_libdiscid_dummy.c <<-EOF #include <stdio.h> #include <discid/discid.h> @@ -97,14 +98,14 @@ 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} @@ -121,7 +122,7 @@ %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 @@ -129,11 +130,8 @@ %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 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
