rpms/guimup/devel Guimup-0.2.1-libmpdclient.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 guimup.spec, 1.7, 1.8 import.log, 1.1, 1.2 sources, 1.2, 1.3 Guimup-0.1.4b-libmpdclient.patch, 1.1, NONE

[Andreas Osowski]

Author: th0br0

Update of /cvs/pkgs/rpms/guimup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28354/devel

Modified Files:
	.cvsignore guimup.spec import.log sources 
Added Files:
	Guimup-0.2.1-libmpdclient.patch 
Removed Files:
	Guimup-0.1.4b-libmpdclient.patch 
Log Message:
Update to 0.2.1

Guimup-0.2.1-libmpdclient.patch:
 configure.ac            |    2 +-
 src/Makefile.am         |    2 --
 src/gm_library_mpdcom.h |    2 +-
 src/gm_mpdcom.h         |    2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

--- NEW FILE Guimup-0.2.1-libmpdclient.patch ---
diff -Naur Guimup-0.2.1.orig/configure.ac Guimup-0.2.1/configure.ac
--- Guimup-0.2.1.orig/configure.ac	2009-12-01 10:21:16.000000000 +0100
+++ Guimup-0.2.1/configure.ac	2009-12-08 14:37:22.000000000 +0100
@@ -27,7 +27,7 @@
 
 LT_INIT
 
-PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.16 libsoup-2.4 >= 2.26 gthread-2.0 >= 2.20])
+PKG_CHECK_MODULES(GUIMUP, [gtkmm-2.4 >= 2.16 libsoup-2.4 >= 2.26 gthread-2.0 >= 2.20 libmpd])
 AC_SUBST(GUIMUP_CFLAGS)
 AC_SUBST(GUIMUP_LIBS)
 
diff -Naur Guimup-0.2.1.orig/src/gm_library_mpdcom.h Guimup-0.2.1/src/gm_library_mpdcom.h
--- Guimup-0.2.1.orig/src/gm_library_mpdcom.h	2009-05-22 14:26:48.000000000 +0200
+++ Guimup-0.2.1/src/gm_library_mpdcom.h	2009-12-08 15:01:25.000000000 +0100
@@ -32,7 +32,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include "gm_commandlist.h"
 #include "gm_itemlist.h"
diff -Naur Guimup-0.2.1.orig/src/gm_mpdcom.h Guimup-0.2.1/src/gm_mpdcom.h
--- Guimup-0.2.1.orig/src/gm_mpdcom.h	2009-05-21 13:51:56.000000000 +0200
+++ Guimup-0.2.1/src/gm_mpdcom.h	2009-12-08 15:01:27.000000000 +0100
@@ -33,7 +33,7 @@
 #include <fstream>
 #include <sstream>
 #include <list>
-#include "libmpdclient.h"
+#include <libmpd/libmpdclient.h>
 #include "gm_songlist.h"
 #include <sys/types.h>
 
diff -Naur Guimup-0.2.1.orig/src/Makefile.am Guimup-0.2.1/src/Makefile.am
--- Guimup-0.2.1.orig/src/Makefile.am	2009-05-20 18:46:31.000000000 +0200
+++ Guimup-0.2.1/src/Makefile.am	2009-12-08 14:38:02.000000000 +0100
@@ -19,8 +19,6 @@
 	gm_player.h \
 	gm_player.cc \
 	gm_player_pix.h \
-	libmpdclient.c \
-	libmpdclient.h \
 	gm_scroller.cc \
 	gm_scroller.h \
 	gm_config.h \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Apr 2009 20:10:03 -0000	1.2
+++ .cvsignore	30 Dec 2009 12:12:53 -0000	1.3
@@ -1 +1 @@
-Guimup-0.1.4bsrc.tar.gz
+Guimup-0.2.1-src.tar.gz


Index: guimup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/guimup.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- guimup.spec	25 Jul 2009 01:52:53 -0000	1.7
+++ guimup.spec	30 Dec 2009 12:12:53 -0000	1.8
@@ -1,18 +1,20 @@
 Name:		guimup
-Version:	0.1.4
-Release:	8.b%{?dist}
+Version:	0.2.1
+Release:	2%{?dist}
 Summary:	A GTKmm based drag-&-drop oriented client for MPD
 
 Group:		Applications/Multimedia
 License:	GPLv3+
 URL:		http://www.coonsden.com/
-Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}bsrc.tar.gz
+Source0:	http://downloads.sourceforge.net/musicpd/Guimup-%{version}-src.tar.gz
 Source1:	guimup.desktop
-Patch0:		Guimup-%{version}b-libmpdclient.patch
+Patch0:		Guimup-%{version}-libmpdclient.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:	gettext-devel
 BuildRequires:	intltool
-BuildRequires:	gtkmm24-devel
+BuildRequires:	gtkmm24-devel >= 2.16
+BuildRequires:	libsoup-devel >= 2.26
 BuildRequires:	libmpd-devel
 BuildRequires:	libtool
 BuildRequires:	desktop-file-utils
@@ -29,9 +31,11 @@ playback functions are directly accessib
 Guimup turns MPD into a perfect desktop music player.
 
 %prep
-%setup -q -n Guimup-%{version}bsrc
+%setup -q -n Guimup-%{version}
 rm src/libmpdclient*
 %patch0 -p1
+rm ltmain.sh
+libtoolize
 autoreconf -f
 
 %build
@@ -67,6 +71,12 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Dec 30 2009 Andreas Osowski <th0br0 at mkdir.name> 0.2.1-2
+- Libtool fixes
+ 
+* Tue Dec  8 2009 Andreas Osowski <th0br0 at mkdir.name> 0.2.1-1
+- Updated to version 0.2.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.4-8.b
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	28 Apr 2009 20:10:03 -0000	1.1
+++ import.log	30 Dec 2009 12:12:53 -0000	1.2
@@ -1 +1,2 @@
 guimup-0_1_4-6_b_fc10:HEAD:guimup-0.1.4-6.b.fc10.src.rpm:1240949243
+guimup-0_2_1-2_fc12:HEAD:guimup-0.2.1-2.fc12.src.rpm:1262175084


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guimup/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Apr 2009 20:10:03 -0000	1.2
+++ sources	30 Dec 2009 12:12:53 -0000	1.3
@@ -1 +1 @@
-76bf768bfc8e6a55b176e35529d93e47  Guimup-0.1.4bsrc.tar.gz
+13d06b8e0b8600eb9f89cc888be0d676  Guimup-0.2.1-src.tar.gz


--- Guimup-0.1.4b-libmpdclient.patch DELETED ---