[soundconverter] Explicitly install to libdir=/usr/lib since this is still a noarch package. Upgrade to 2.0-rc4 and d

[Michael Schwendt]

commit 0d7f56ff92e69f83b4c33292be615f4d448656b2
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Jan 4 15:11:45 2012 +0100

    Explicitly install to libdir=/usr/lib since this is still a noarch package.
    Upgrade to 2.0-rc4 and drop merged/obsolete patches.

 .gitignore                                    |    1 +
 soundconverter-1.5.3-bz647336.patch           |  286 -------------------------
 soundconverter-1.5.4-clearlist.patch          |   11 -
 soundconverter-1.5.4-flacogg.patch            |   90 --------
 soundconverter-1.5.4-gst-profile-bad.patch    |   18 --
 soundconverter-1.5.4-gst-profile-lang.patch   |   46 ----
 soundconverter-1.5.4-markup_escape_text.patch |   16 --
 soundconverter-2.0-rc4-gstmodel.patch         |   13 ++
 soundconverter.spec                           |   45 ++---
 sources                                       |    2 +-
 10 files changed, 28 insertions(+), 500 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3724b64..25a2a66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 soundconverter-1.5.3.tar.gz
 /soundconverter-1.5.4.tar.gz
 /soundconverter-1.5.4.tar.bz2
+/soundconverter-2.0-rc4.tar.xz
diff --git a/soundconverter-2.0-rc4-gstmodel.patch b/soundconverter-2.0-rc4-gstmodel.patch
new file mode 100644
index 0000000..e6550e3
--- /dev/null
+++ b/soundconverter-2.0-rc4-gstmodel.patch
@@ -0,0 +1,13 @@
+diff -Nurb --strip-trailing-cr soundconverter-2.0-rc4-orig/soundconverter/ui.py soundconverter-2.0-rc4/soundconverter/ui.py
+--- soundconverter-2.0-rc4-orig/soundconverter/ui.py	2012-01-04 11:11:19.000000000 +0100
++++ soundconverter-2.0-rc4/soundconverter/ui.py	2012-01-04 15:02:10.480939114 +0100
+@@ -521,8 +521,7 @@
+                                                                  len(widgets))
+ 
+         if not self.gstprofile.get_model().get_n_columns():
+-            model = gtk.ListStore(str)
+-            self.gstprofile.set_model(model)
++            self.gstprofile.set_model(gtk.ListStore(str))
+             cell = gtk.CellRendererText()
+             self.gstprofile.pack_start(cell)
+             self.gstprofile.add_attribute(cell,'text',0)
diff --git a/soundconverter.spec b/soundconverter.spec
index 4e4e491..12bcebf 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -1,12 +1,14 @@
+%global tar_ver 2.0-rc4
+
 Name:           soundconverter
-Version:        1.5.4
-Release:        11%{?dist}
+Version:        2.0
+Release:        0.1.rc4%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://soundconverter.org
-Source0:        http://launchpad.net/soundconverter/trunk/1.5.4/+download/soundconverter-%{version}.tar.bz2
+Source0:        http://launchpad.net/soundconverter/trunk/%{tar_ver}/+download/soundconverter-%{tar_ver}.tar.xz
 BuildArch:      noarch
 
 BuildRequires:  desktop-file-utils
@@ -14,23 +16,6 @@ BuildRequires:  intltool gettext
 BuildRequires:  pygtk2
 BuildRequires:  gnome-python2-gnome
 
-# reported upstream, #017664
-# in 1.5.4 translatable strings are either untranslated and/or marked as fuzzy
-# NOT APPLIED in 1.5.4
-Patch0: soundconverter-1.5.3-bz647336.patch
-# launchpad 814015
-# Fedora bz 714454
-Patch1: soundconverter-1.5.4-gst-profile-lang.patch
-# launchpad 814011
-# Fedora bz 718334, glib2 markup_escape_text wants utf-8, else segfaults
-Patch2: soundconverter-1.5.4-markup_escape_text.patch
-# launchpad 784918
-Patch3: soundconverter-1.5.4-clearlist.patch
-# disable FLAC to Ogg Vorbis due to damaged files, GStreamer bz 651615
-#Patch4: soundconverter-1.5.4-flacogg.patch
-# Fedora bz 744596
-Patch5: soundconverter-1.5.4-gst-profile-bad.patch
-
 # enforce availability of this and its requirement "desktop-notification-daemon"
 Requires:       notify-python
 
@@ -62,21 +47,12 @@ writes anything the GStreamer library can.
 
 
 %prep
-%setup -q
-# see Patch0
-#patch0 -p1 -b .bz647336
-%patch1 -p1 -b .bz714454
-%patch2 -p1 -b .bz718334
-%patch3 -p1 -b .really-clearlist
-# gstreamer-plugins-good with backported fix has been pushed on 20111210
-# F-16 https://admin.fedoraproject.org/updates/FEDORA-2011-16499
-# F-15 https://admin.fedoraproject.org/updates/FEDORA-2011-16543
-#patch4 -p1 -b .flacoggdisable
-%patch5 -p1 -b .bz744596
+%setup -q -n %{name}-%{tar_ver}
 
 
 %build
-%configure --disable-dependency-tracking
+%configure --disable-dependency-tracking \
+    --libdir=/usr/lib
 make %{?_smp_mflags}
 
 
@@ -113,6 +89,7 @@ update-desktop-database &> /dev/null ||:
 %doc ChangeLog COPYING README TODO
 %{_mandir}/man1/%{name}*
 %{_bindir}/%{name}
+/usr/lib/%{name}/
 %{_datadir}/%{name}/
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
@@ -120,6 +97,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Jan  4 2012 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0-0.1.rc4
+- Explicitly install to libdir=/usr/lib since this is still a noarch package.
+- Upgrade to 2.0-rc4 and drop merged/obsolete patches.
+
 * Sat Dec 10 2011 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.4-11
 - Reenable FLAC to Ogg Vorbis conversion and require at least the
   first build of the gstreamer-plugins-good package that contains
diff --git a/sources b/sources
index ca1d68c..25df8e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5f4069e29764b4b1b0418c9b4ce035f7  soundconverter-1.5.4.tar.bz2
+0aff36e73db8e5fe1dc6f64002a7580e  soundconverter-2.0-rc4.tar.xz