[guimup] 0.3.1
Tom Callaway
spot at fedoraproject.org
Wed Mar 21 15:25:30 UTC 2012
commit 19a798258b26b9022e83fb2b493ae2a55a983e78
Author: Tom Callaway <spot at fedoraproject.org>
Date: Wed Mar 21 11:25:28 2012 -0400
0.3.1
.gitignore | 1 +
guimup-0.3.1-fix.patch | 79 ++++++++++++++++++++++++++++++++++++++++++++++++
guimup.spec | 49 ++++++++++++++---------------
guimup48.png | Bin 0 -> 4551 bytes
sources | 2 +-
5 files changed, 105 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8ee3c7..fb5910e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Guimup-0.2.1-src.tar.gz
+/guimup_0.3.1_src.tar.gz
diff --git a/guimup-0.3.1-fix.patch b/guimup-0.3.1-fix.patch
new file mode 100644
index 0000000..62dc6aa
--- /dev/null
+++ b/guimup-0.3.1-fix.patch
@@ -0,0 +1,79 @@
+diff -up guimup_0.3.1_src/guimup/configure.ac.fix guimup_0.3.1_src/guimup/configure.ac
+--- guimup_0.3.1_src/guimup/configure.ac.fix 2012-03-21 10:56:01.395747458 -0400
++++ guimup_0.3.1_src/guimup/configure.ac 2012-03-21 10:56:07.921695076 -0400
+@@ -22,7 +22,7 @@ LT_INIT
+
+ PKG_CHECK_MODULES(GUIMUP, libsoup-2.4
+ unique-3.0
+-[gtkmm-3.0 libmpdclient])
++[gtkmm-3.0 gthread-2.0 libmpdclient])
+
+
+
+diff -up guimup_0.3.1_src/guimup/src/gm_config.h.fix guimup_0.3.1_src/guimup/src/gm_config.h
+--- guimup_0.3.1_src/guimup/src/gm_config.h.fix 2012-03-21 10:48:16.986475121 -0400
++++ guimup_0.3.1_src/guimup/src/gm_config.h 2012-03-21 10:48:29.924371270 -0400
+@@ -28,6 +28,7 @@
+ #include <gtkmm/dialog.h>
+ #include <gtkmm/grid.h>
+ #include <gtkmm/label.h>
++#include <glibmm/fileutils.h>
+ #include <glibmm/ustring.h>
+ using Glib::ustring;
+ #include <iostream>
+diff -up guimup_0.3.1_src/guimup/src/gm_libraryview.h.fix guimup_0.3.1_src/guimup/src/gm_libraryview.h
+--- guimup_0.3.1_src/guimup/src/gm_libraryview.h.fix 2012-03-21 10:52:07.914621528 -0400
++++ guimup_0.3.1_src/guimup/src/gm_libraryview.h 2012-03-21 10:52:16.212554925 -0400
+@@ -34,6 +34,7 @@
+ #include <gtkmm/imagemenuitem.h>
+ #include <sigc++/sigc++.h>
+ #include <glibmm/main.h>
++#include <glibmm/spawn.h>
+ #include <glibmm/ustring.h>
+ using Glib::ustring;
+ #include <string>
+diff -up guimup_0.3.1_src/guimup/src/gm_mpdcom.h.fix guimup_0.3.1_src/guimup/src/gm_mpdcom.h
+--- guimup_0.3.1_src/guimup/src/gm_mpdcom.h.fix 2012-03-21 10:49:32.925865577 -0400
++++ guimup_0.3.1_src/guimup/src/gm_mpdcom.h 2012-03-21 10:49:42.554788287 -0400
+@@ -24,6 +24,7 @@
+
+ #include <gtkmm/main.h>
+ #include <glibmm/main.h>
++#include <glibmm/stringutils.h>
+ #include <glibmm/ustring.h>
+ using Glib::ustring;
+ #include <fstream>
+diff -up guimup_0.3.1_src/guimup/src/gm_player.h.fix guimup_0.3.1_src/guimup/src/gm_player.h
+--- guimup_0.3.1_src/guimup/src/gm_player.h.fix 2012-03-21 10:50:23.084462969 -0400
++++ guimup_0.3.1_src/guimup/src/gm_player.h 2012-03-21 10:51:01.398155436 -0400
+@@ -33,6 +33,8 @@
+ #include <gtkmm/imagemenuitem.h>
+ #include <gtkmm/settings.h> // sys-font
+ #include <glibmm/main.h>
++#include <glibmm/convert.h>
++#include <glibmm/spawn.h>
+ #include <glibmm/ustring.h>
+ using Glib::ustring;
+ #include <iostream>
+diff -up guimup_0.3.1_src/guimup/src/gm_playlistview.h.fix guimup_0.3.1_src/guimup/src/gm_playlistview.h
+--- guimup_0.3.1_src/guimup/src/gm_playlistview.h.fix 2012-03-21 10:51:31.388914710 -0400
++++ guimup_0.3.1_src/guimup/src/gm_playlistview.h 2012-03-21 10:51:41.705831899 -0400
+@@ -35,6 +35,7 @@
+ #include <gtkmm/imagemenuitem.h>
+ #include <list>
+ #include <glibmm/main.h>
++#include <glibmm/convert.h>
+ #include <glibmm/ustring.h>
+ using Glib::ustring;
+ #include <sigc++/sigc++.h>
+diff -up guimup_0.3.1_src/guimup/src/main.cc.fix guimup_0.3.1_src/guimup/src/main.cc
+--- guimup_0.3.1_src/guimup/src/main.cc.fix 2012-03-21 10:49:00.008129798 -0400
++++ guimup_0.3.1_src/guimup/src/main.cc 2012-03-21 10:49:09.476053803 -0400
+@@ -20,6 +20,7 @@
+ */
+
+ #include <gtkmm/main.h>
++#include <glibmm/stringutils.h>
+ #include <unique/unique.h>
+ #include "gm_player.h"
+ #include <iostream>
diff --git a/guimup.spec b/guimup.spec
index 9576f08..3e7c69d 100644
--- a/guimup.spec
+++ b/guimup.spec
@@ -1,21 +1,22 @@
Name: guimup
-Version: 0.2.1
-Release: 6%{?dist}
+Version: 0.3.1
+Release: 1%{?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}-src.tar.gz
+Source0: http://downloads.sourceforge.net/musicpd/%{name}_%{version}_src.tar.gz
Source1: guimup.desktop
-Patch0: Guimup-%{version}-libmpdclient.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+# Taken from the 0.2.1 source
+Source2: guimup48.png
+Patch0: guimup-0.3.1-fix.patch
BuildRequires: gettext-devel
BuildRequires: intltool
BuildRequires: gtkmm24-devel >= 2.16
-BuildRequires: libsoup-devel >= 2.26
-BuildRequires: libmpd-devel
+BuildRequires: libsoup-devel >= 2.36
+BuildRequires: libmpdclient-devel >= 2.3
+BuildRequires: gtkmm30-devel >= 3.2
+BuildRequires: unique3-devel >= 3.0.2
BuildRequires: libtool
BuildRequires: desktop-file-utils
@@ -31,23 +32,20 @@ playback functions are directly accessible from the system tray.
Guimup turns MPD into a perfect desktop music player.
%prep
-%setup -q -n Guimup-%{version}
-rm src/libmpdclient*
-%patch0 -p1
-rm ltmain.sh
-libtoolize
-autoreconf -f
+%setup -q -n %{name}_%{version}_src
+%patch0 -p1 -b .fix
%build
+pushd %{name}
+autoreconf -ifv
%configure
export echo=echo # libtool fails otherwise
make %{?_smp_mflags}
-
+popd
%install
-rm -rf %{buildroot}
-
-%{__mkdir_p} %{buildroot}%{_datadir}/pixmaps
+pushd %{name}
+mkdir -p %{buildroot}%{_datadir}/pixmaps
make install DESTDIR=%{buildroot} \
INSTALL="install -p" echo=echo
@@ -57,20 +55,21 @@ rm -rf %{buildroot}%{_usr}/doc
desktop-file-install \
--dir=%{buildroot}/%{_datadir}/applications \
%{SOURCE1}
-install -p -m0644 Icons/%{name}48.png \
+install -p -m0644 %{SOURCE2} \
%{buildroot}%{_datadir}/pixmaps/%{name}.png
-%clean
-rm -rf %{buildroot}
-
+cp AUTHORS ChangeLog COPYING README ..
+popd
%files
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ README
+%doc AUTHORS ChangeLog COPYING README
%{_bindir}/%{name}
%{_datadir}/applications/%{name}*
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Wed Mar 21 2012 Tom Callaway <spot at fedoraproject.org> - 0.3.1-1
+- update to 0.3.1
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-6
- Rebuilt for c++ ABI breakage
diff --git a/guimup48.png b/guimup48.png
new file mode 100644
index 0000000..97cf1dc
Binary files /dev/null and b/guimup48.png differ
diff --git a/sources b/sources
index 3fb8d9b..7e354a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13d06b8e0b8600eb9f89cc888be0d676 Guimup-0.2.1-src.tar.gz
+f90ea86e5870220c130eed103814c69f guimup_0.3.1_src.tar.gz
More information about the scm-commits
mailing list