[picard] SPEC cleanup: 1. Icon cache scriptlet added; 2. Obsoleted RPM macros cleaned; 3. Other cosmetic chan
Christopher Meng
cicku at fedoraproject.org
Mon May 5 08:39:49 UTC 2014
commit f656cdd14de057091aa880039b0b88da8cd8d72d
Author: Christopher Meng <i at cicku.me>
Date: Mon May 5 16:39:26 2014 +0800
SPEC cleanup:
1. Icon cache scriptlet added;
2. Obsoleted RPM macros cleaned;
3. Other cosmetic changes.
picard.spec | 172 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 82 insertions(+), 90 deletions(-)
---
diff --git a/picard.spec b/picard.spec
index 2b62ae9..fe960ef 100644
--- a/picard.spec
+++ b/picard.spec
@@ -1,55 +1,48 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Name: picard
-Version: 1.2
-Release: 2%{?dist}
-Summary: MusicBrainz-based audio tagger
-Group: Applications/Multimedia
-
-Source0: http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-%{version}.tar.gz
+Name: picard
+Version: 1.2
+Release: 2%{?dist}
+Summary: MusicBrainz-based audio tagger
+License: GPLv2+
+URL: http://musicbrainz.org/doc/MusicBrainz_Picard
+Source0: http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-%{version}.tar.gz
# plugins, now distributed inside contrib/plugins directory,
# keep upstream URLs around in case we want to add upstream version
-#Source1: http://users.musicbrainz.org/~luks/picard-plugins/discnumber.py
-#Source2: http://users.musicbrainz.org/~luks/picard-plugins/featartist.py
-#Source3: http://users.musicbrainz.org/~luks/picard-plugins/coverart.py
-#Source4: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/__init__.py
-#Source5: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/ui_options_lastfm.py
-#Source6: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/options_lastfm.ui
-#Source7: http://users.musicbrainz.org/~luks/picard-plugins/cuesheet.py
-#Source8: http://users.musicbrainz.org/~luks/picard-plugins/open_in_gui.py
-#Source9: http://users.musicbrainz.org/~luks/picard-plugins/swapprefix.py
-#Source10: http://users.musicbrainz.org/~luks/picard-plugins/titlecase.py
-#Source11: http://users.musicbrainz.org/~luks/picard-plugins/tracks2clipboard.py
-#Source12: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/__init__.py
-#Source13: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/ui_options_replaygain.py
-#Source14: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/options_replaygain.ui
-#Source15: http://users.musicbrainz.org/~luks/picard-plugins/featartistsintitles.py
-#Source16: http://users.musicbrainz.org/~luks/picard-plugins/release_type.py
-#Source17: http://users.musicbrainz.org/~luks/picard-plugins/no_release.py
-#Source18: http://gitorious.org/musicbrainz/addrelease/blobs/raw/master/addrelease.py
+#Source1: http://users.musicbrainz.org/~luks/picard-plugins/discnumber.py
+#Source2: http://users.musicbrainz.org/~luks/picard-plugins/featartist.py
+#Source3: http://users.musicbrainz.org/~luks/picard-plugins/coverart.py
+#Source4: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/__init__.py
+#Source5: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/ui_options_lastfm.py
+#Source6: http://users.musicbrainz.org/~luks/picard-plugins/lastfm/options_lastfm.ui
+#Source7: http://users.musicbrainz.org/~luks/picard-plugins/cuesheet.py
+#Source8: http://users.musicbrainz.org/~luks/picard-plugins/open_in_gui.py
+#Source9: http://users.musicbrainz.org/~luks/picard-plugins/swapprefix.py
+#Source10: http://users.musicbrainz.org/~luks/picard-plugins/titlecase.py
+#Source11: http://users.musicbrainz.org/~luks/picard-plugins/tracks2clipboard.py
+#Source12: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/__init__.py
+#Source13: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/ui_options_replaygain.py
+#Source14: http://users.musicbrainz.org/~luks/picard-plugins/replaygain/options_replaygain.ui
+#Source15: http://users.musicbrainz.org/~luks/picard-plugins/featartistsintitles.py
+#Source16: http://users.musicbrainz.org/~luks/picard-plugins/release_type.py
+#Source17: http://users.musicbrainz.org/~luks/picard-plugins/no_release.py
+#Source18: http://gitorious.org/musicbrainz/addrelease/blobs/raw/master/addrelease.py
# not yet included in contrib/ directory
-Source19: http://github.com/voiceinsideyou/creaps-picard-plugins/raw/master/titlesort.py
-Source20: http://github.com/voiceinsideyou/creaps-picard-plugins/raw/master/titleversion.py
+Source19: http://github.com/voiceinsideyou/creaps-picard-plugins/raw/master/titlesort.py
+Source20: http://github.com/voiceinsideyou/creaps-picard-plugins/raw/master/titleversion.py
# bonusdisc.py not yet ported
# search plugins are obsolete
-
-License: GPLv2+
-Url: http://musicbrainz.org/doc/PicardTagger
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel
-BuildRequires: gettext
-BuildRequires: desktop-file-utils
-BuildRequires: PyQt4 >= 4.6
-BuildRequires: python-mutagen > 1.9
-BuildRequires: libofa-devel
-Requires: PyQt4 >= 4.6
-Requires: python-mutagen > 1.9
-Requires: libdiscid
-
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
+BuildRequires: libofa-devel
+BuildRequires: PyQt4
+BuildRequires: python2-devel
+BuildRequires: python-mutagen
+Requires: hicolor-icon-theme
+Requires: PyQt4
+Requires: python-mutagen
+Requires: libdiscid
%description
Picard is an audio tagging application using data from the MusicBrainz
@@ -57,77 +50,76 @@ database. The tagger is album or release oriented, rather than
track-oriented.
%prep
-%setup -q -n picard-%{version}
+%setup -q
%build
-env %{__python} setup.py config
-env CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+%{__python2} setup.py config
+env CFLAGS="%{optflags}" %{__python2} setup.py build
%install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
+%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
%find_lang %{name}
desktop-file-install \
-%if 0%{?fedora} && 0%{?fedora} < 19
- --vendor="fedora" \
-%endif
--delete-original --remove-category="Application" \
- --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
- $RPM_BUILD_ROOT/%{_datadir}/applications/*
+ --dir=%{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/*
# install plugins
-PLUGINDIR=$RPM_BUILD_ROOT%{python_sitearch}/picard/plugins/
-install -pm 0644 contrib/plugins/discnumber.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/featartist.py ${PLUGINDIR}
+PLUGINDIR=%{buildroot}%{python2_sitearch}/picard/plugins/
+install -pm0644 contrib/plugins/discnumber.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/featartist.py ${PLUGINDIR}
mkdir ${PLUGINDIR}/lastfm/
-install -pm 0644 contrib/plugins/lastfm/__init__.py ${PLUGINDIR}/lastfm/
-install -pm 0644 contrib/plugins/lastfm/ui_options_lastfm.py ${PLUGINDIR}/lastfm/
-install -pm 0644 contrib/plugins/lastfm/options_lastfm.ui ${PLUGINDIR}/lastfm/
-install -pm 0644 contrib/plugins/cuesheet.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/open_in_gui.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/swapprefix.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/titlecase.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/tracks2clipboard.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/lastfm/__init__.py ${PLUGINDIR}/lastfm/
+install -pm0644 contrib/plugins/lastfm/ui_options_lastfm.py ${PLUGINDIR}/lastfm/
+install -pm0644 contrib/plugins/lastfm/options_lastfm.ui ${PLUGINDIR}/lastfm/
+install -pm0644 contrib/plugins/cuesheet.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/open_in_gui.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/swapprefix.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/titlecase.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/tracks2clipboard.py ${PLUGINDIR}
mkdir ${PLUGINDIR}/replaygain/
-install -pm 0644 contrib/plugins/replaygain/__init__.py ${PLUGINDIR}/replaygain/
-install -pm 0644 contrib/plugins/replaygain/ui_options_replaygain.py ${PLUGINDIR}/replaygain/
-install -pm 0644 contrib/plugins/replaygain/options_replaygain.ui ${PLUGINDIR}/replaygain/
-install -pm 0644 contrib/plugins/featartistsintitles.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/release_type.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/no_release.py ${PLUGINDIR}
-install -pm 0644 contrib/plugins/addrelease.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/replaygain/__init__.py ${PLUGINDIR}/replaygain/
+install -pm0644 contrib/plugins/replaygain/ui_options_replaygain.py ${PLUGINDIR}/replaygain/
+install -pm0644 contrib/plugins/replaygain/options_replaygain.ui ${PLUGINDIR}/replaygain/
+install -pm0644 contrib/plugins/featartistsintitles.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/release_type.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/no_release.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/addrelease.py ${PLUGINDIR}
mkdir ${PLUGINDIR}/lastfmplus/
-install -pm 0644 contrib/plugins/lastfmplus/__init__.py ${PLUGINDIR}/lastfmplus/
-install -pm 0644 contrib/plugins/lastfmplus/ui_options_lastfm.py ${PLUGINDIR}/lastfmplus/
-install -pm 0644 contrib/plugins/classicdiscnumber.py ${PLUGINDIR}
+install -pm0644 contrib/plugins/lastfmplus/__init__.py ${PLUGINDIR}/lastfmplus/
+install -pm0644 contrib/plugins/lastfmplus/ui_options_lastfm.py ${PLUGINDIR}/lastfmplus/
+install -pm0644 contrib/plugins/classicdiscnumber.py ${PLUGINDIR}
-install -pm 0644 %{SOURCE19} ${PLUGINDIR}
-install -pm 0644 %{SOURCE20} ${PLUGINDIR}
+install -pm0644 %{SOURCE19} ${PLUGINDIR}
+install -pm0644 %{SOURCE20} ${PLUGINDIR}
-echo %{fedora}
+echo %{?fedora}
## disable tests for the moment
%check
-%{?_with_check:%{__python} setup.py test || :}
+%{?_with_check:%{__python2} setup.py test || :}
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
-%clean
-rm -rf $RPM_BUILD_ROOT
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS.txt COPYING.txt NEWS.txt INSTALL.txt
+%doc AUTHORS.txt COPYING.txt NEWS.txt
%{_bindir}/picard
-%if 0%{?fedora} && 0%{?fedora} < 19
-%{_datadir}/applications/fedora-picard.desktop
-%else
%{_datadir}/applications/picard.desktop
-%endif
%{_datadir}/icons/hicolor/*/apps/picard.png
-%{python_sitearch}/*egg-info
-%dir %{python_sitearch}/picard
-%{python_sitearch}/picard/*
+%{python2_sitearch}/*egg-info
+%{python2_sitearch}/picard/
%changelog
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-2
More information about the scm-commits
mailing list