From a5e241c2fa6242f1ef3152c372a0b4cae62fc85c Mon Sep 17 00:00:00 2001
From: alexlan <alexlan@fedoraproject.org>
Date: Nov 07 2009 06:48:07 +0000
Subject: Sync with F-12 branch: update to 0.12.1


---

diff --git a/.cvsignore b/.cvsignore
index 02fdf87..1025781 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,19 @@
-picard-0.11.tar.gz
+picard-0.12.1.tar.gz
+SearchAmazon3.py
+SearchAMG.py
+SearchCastAlbums3.py
+SearchDiscogs3.py
+SearchFilmMusziek3.py
+SearchGMR.py
+SearchGoogle3.py
+SearchLortelArchives3.py
+SearchSoundtrackCollector3.py
+SearchSoundtrackINFO3.py
+ui_options_lastfm.py
+bonusdisc.py
+addrelease.py
+cuesheet.py
+discnumber.py
+featartist.py
+__init__.py
+coverart.py
\ No newline at end of file
diff --git a/picard.spec b/picard.spec
index 4fde78f..4c9508f 100644
--- a/picard.spec
+++ b/picard.spec
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:             picard
-Version:          0.11
-Release:          3%{?dist}
+Version:          0.12.1
+Release:          1%{?dist}
 Summary:          MusicBrainz-based audio tagger
 Group:            Applications/Multimedia
 
@@ -65,10 +65,6 @@ desktop-file-install --vendor="fedora"                \
   --delete-original --remove-category="Application"   \
   --dir=$RPM_BUILD_ROOT/%{_datadir}/applications      \
   $RPM_BUILD_ROOT/%{_datadir}/applications/*
-# move from icons/ to pixmaps/
-mkdir $RPM_BUILD_ROOT/%{_datadir}/pixmaps
-install -pm 0644 $RPM_BUILD_ROOT%{_datadir}/icons/picard-*.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/icons
 
 # install plugins
 PLUGINDIR=$RPM_BUILD_ROOT%{python_sitearch}/picard/plugins/
@@ -107,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS.txt COPYING.txt NEWS.txt INSTALL.txt
 %{_bindir}/picard
 %{_datadir}/applications/fedora-picard.desktop
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/picard.png
 %if 0%{?fedora} >= 9
 %{python_sitearch}/*egg-info
 %endif
@@ -115,6 +111,16 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/picard/*
 
 %changelog
+* Tue Nov  3 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.12.1-1
+- Update to upstream 0.12.1 (brown bag fix release)
+
+* Tue Oct 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.12-1
+- Update to 0.12 (#531224)
+- Icons now in icons/hicolor directory
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index c23470f..3062b37 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-02ddcff3e201b2cf54f1b52b02d44fad  picard-0.11.tar.gz
+cfe594d68924afbc0704888130295c85  picard-0.12.1.tar.gz
 f58cb1c53d94e22b5c6cd6fcd91a2d5e  SearchAmazon3.py
 c2b8a059dd047c7f7b48a0d872373171  SearchAMG.py
 eedcec32b66e89c3ba27ee4c37c11241  SearchCastAlbums3.py