From 4fdd9a5bbbc3fb402c98d261051eeacb2189e795a6a5ec7693a6903aa2401822 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Wed, 11 Apr 2012 13:35:39 +0000 Subject: [PATCH] - Remove obsolete SUSE version checks - Call icon_theme_cache_post(un) (bnc#756522) - Remove Mandriva checks, not tested nor enabled in this project OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/picard?expand=0&rev=24 --- picard.changes | 7 +++++++ picard.spec | 51 +++++++++++--------------------------------------- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/picard.changes b/picard.changes index de4cc02..b0953a4 100644 --- a/picard.changes +++ b/picard.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 11 07:42:52 UTC 2012 - saschpe@suse.de + +- Remove obsolete SUSE version checks +- Call icon_theme_cache_post(un) (bnc#756522) +- Remove Mandriva checks, not tested nor enabled in this project + ------------------------------------------------------------------- Sun Apr 1 16:52:18 CEST 2012 - ohering@suse.de diff --git a/picard.spec b/picard.spec index 635fd3a..fab5478 100644 --- a/picard.spec +++ b/picard.spec @@ -46,29 +46,19 @@ BuildRequires: gcc-c++ BuildRequires: libdiscid-devel BuildRequires: libofa-devel BuildRequires: python-devel +BuildRequires: python-mutagen +Requires: python-mutagen %if 0%{?suse_version} 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 -BuildRequires: python-mutagen -Requires: python-mutagen -%endif -%if 0%{?mandriva_version} -BuildRequires: python-qt4 %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_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 +%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %description MusicBrainz Picard is a cross-platform MusicBrainz tag editor written in @@ -132,41 +122,22 @@ desktop-file-install --delete-original --remove-category="Application" \ mkdir -vp %{buildroot}/%{_libdir}/%{name} cp -avL %{name}_libdiscid_dummy %{buildroot}/%{_libdir}/%{name} -%if 0%{?mandriva_version} > 2006 - %post -%update_menus +%icon_theme_cache_post %postun -%clean_menus -%endif - -%if 0%{?suse_version} > 1020 - -%files lang -f %{name}.lang -%defattr(-,root,root) -%if 0%{?suse_version} && 0%{?suse_version} < 1130 -%lang(sco) %dir %{_datadir}/locale/sco -%lang(sco) %dir %{_datadir}/locale/sco/LC_MESSAGES -%endif +%icon_theme_cache_postun %files %defattr(-,root,root) -%else - -%files -f %{name}.lang -%defattr(-,root,root) -%endif %doc AUTHORS.txt COPYING.txt NEWS.txt %{_bindir}/picard -/%{_libdir}/%{name} +%{_libdir}/%{name} %{_datadir}/applications/%{name}.desktop -%{py_sitedir}/picard* -%{_datadir}/icons/hicolor/16x16/apps/picard.png -%{_datadir}/icons/hicolor/24x24/apps/picard.png -%{_datadir}/icons/hicolor/32x32/apps/picard.png -%{_datadir}/icons/hicolor/48x48/apps/picard.png -%{_datadir}/icons/hicolor/128x128/apps/picard.png -%{_datadir}/icons/hicolor/256x256/apps/picard.png +%{python_sitearch}/picard* +%{_datadir}/icons/hicolor/*/apps/picard.png + +%files lang -f %{name}.lang +%defattr(-,root,root) %changelog