rpms/audacious-plugins/devel audacious-plugins-2.2-no-adplugdb.patch, NONE, 1.1 audacious-plugins.spec, 1.103, 1.104

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10971

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-no-adplugdb.patch 
Log Message:
* Sat Mar 13 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-26
- Don't warn on stderr about missing adplug.db (#573075).


audacious-plugins-2.2-no-adplugdb.patch:
 adplug-xmms.cc |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE audacious-plugins-2.2-no-adplugdb.patch ---
diff -Nur audacious-plugins-2.2-orig/src/adplug/adplug-xmms.cc audacious-plugins-2.2/src/adplug/adplug-xmms.cc
--- audacious-plugins-2.2-orig/src/adplug/adplug-xmms.cc	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2/src/adplug/adplug-xmms.cc	2010-03-13 19:29:06.000000000 +0100
@@ -1043,8 +1043,10 @@
     {
       std::string userdb;
       userdb = "file://" + std::string(g_get_home_dir()) + "/" ADPLUG_CONFDIR "/" + ADPLUGDB_FILE;
+      if (aud_vfs_file_test(userdb.c_str(),G_FILE_TEST_EXISTS)) {
       plr.db->load (userdb);    // load user's database
       dbg_printf (" (userdb=\"%s\")", userdb.c_str());
+      }
     }
   }
   CAdPlug::set_database (plr.db);


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -p -r1.103 -r1.104
--- audacious-plugins.spec	7 Mar 2010 09:58:49 -0000	1.103
+++ audacious-plugins.spec	13 Mar 2010 18:35:57 -0000	1.104
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 25%{?dist}
+Release: 26%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -61,6 +61,8 @@ Patch15: audacious-plugins-2.2-streambro
 Patch16: audacious-plugins-2.2-scrobbler.patch
 # merged upstream with additional patch for 2.3: AUDPLUG-170
 Patch17: audacious-plugins-2.2-status.patch
+#
+Patch18: audacious-plugins-2.2-no-adplugdb.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -208,6 +210,7 @@ in Vortex (.vtx) format.
 %patch15 -p1 -b .streambrowser-url-add
 %patch16 -p1 -b .scrobbler
 %patch17 -p1 -b .status
+%patch18 -p1 -b .no-adplugdb
 
 for i in src/ladspa/ladspa.c
 do
@@ -308,6 +311,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Mar 13 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-26
+- Don't warn on stderr about missing adplug.db (#573075).
+
 * Thu Mar  4 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-25
 - Update icon popup patch for new playlist API to also fix a double-free
   (which made the popup crash with streaming audio).