0.3.3

.cvsignore

@@ -1 +1 @@
-ncmpcpp-0.3.2.tar.bz2
+ncmpcpp-0.3.3.tar.bz2

import.log

@@ -2,3 +2,4 @@ ncmpcpp-0_2_5-4_fc10:HEAD:ncmpcpp-0.2.5-4.fc10.src.rpm:1232146929
 ncmpcpp-0_3-1_fc10:HEAD:ncmpcpp-0.3-1.fc10.src.rpm:1233686760
 ncmpcpp-0_3_1-1_fc10:HEAD:ncmpcpp-0.3.1-1.fc10.src.rpm:1235383091
 ncmpcpp-0_3_2-1_fc11:HEAD:ncmpcpp-0.3.2-1.fc11.src.rpm:1237365482
+ncmpcpp-0_3_3-1_fc11:HEAD:ncmpcpp-0.3.3-1.fc11.src.rpm:1239008066

ncmpcpp-0.3.2-charset.patch

@@ -1,51 +0,0 @@
-From: Andrzej Rybczak <electricityispower@gmail.com>
-Date: Tue, 17 Mar 2009 22:57:36 +0000 (+0100)
-Subject: Revert "use inline functions instead of macros in charset.h"
-X-Git-Url: http://repo.or.cz/w/ncmpcpp.git?a=commitdiff_plain;h=503c4964d56a1140331d02c0f56dfc7efb733c40
-
-Revert "use inline functions instead of macros in charset.h"
-
-This reverts commit 7f2a635ac59805e29dd35aad8cba4a1aeaad6f99.
----
-
-diff --git a/src/charset.h b/src/charset.h
-index dd18e18..8d093d7 100644
---- a/src/charset.h
-+++ b/src/charset.h
-@@ -25,10 +25,10 @@
- #include <config.h>
- #endif
- 
--#include <string>
--
- #if defined(SUPPORTED_LOCALES) && defined(HAVE_ICONV_H)
- 
-+#include <string>
-+
- void init_current_locale();
- 
- void utf_to_locale(std::string &);
-@@ -42,16 +42,16 @@ void str_pool_locale_to_utf(char *&);
- 
- #else
- 
--void init_current_locale() { }
-+#define init_current_locale();
- 
--void utf_to_locale(std::string &) { }
--void locale_to_utf(std::string &) { }
-+#define utf_to_locale(x);
-+#define locale_to_utf(x);
- 
--std::string &utf_to_locale_cpy(const std::string &s) { return s; }
--std::string &locale_to_utf_cpy(const std::string &s) { return s; }
-+#define utf_to_locale_cpy(x) (x)
-+#define locale_to_utf_cpy(x) (x)
- 
--void str_pool_utf_to_locale(char *&) { }
--void str_pool_locale_to_utf(char *&) { }
-+#define str_pool_utf_to_locale(x);
-+#define str_pool_locale_to_utf(x);
- 
- #endif // SUPPORTED_LOCALES && HAVE_ICONV_H
- 

ncmpcpp.spec

@@ -1,12 +1,11 @@
 Name:           ncmpcpp
-Version:        0.3.2
+Version:        0.3.3
 Release:        1%{?dist}
 Summary:        Clone of ncmpc with new features and written in C++
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://unkart.ovh.org/ncmpcpp
 Source0:        http://unkart.ovh.org/ncmpcpp/%{name}-%{version}.tar.bz2
-Patch0:         ncmpcpp-0.3.2-charset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  curl-devel
@@ -23,9 +22,6 @@ use search screen, media library screen, lyrics screen and more.
 
 %prep
 %setup -q
-# upstream patch, compilation was failing
-# --> http://repo.or.cz/w/ncmpcpp.git?a=commitdiff;h=503c4964d56a1140331d02c0f56dfc7efb733c40#patch1
-%patch0 -p1
 
 
 %build
@@ -52,6 +48,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Apr 06 2009 Michal Nowak <mnowak@redhat.com> - 0.3.3-1
+- dumped ncmpcpp-0.3.2-charset.patch -- upstream already 
+- 0.3.3
+
 * Wed Mar 18 2009 Michal Nowak <mnowak@redhat.com> - 0.3.2-1
 - 0.3.2
 - added ncmpcpp man page

sources

@@ -1 +1 @@
-e2159a391b21d3fcf9a4613f589fb213  ncmpcpp-0.3.2.tar.bz2
+409406e353bc8a7f5b8cfc4247d7d562  ncmpcpp-0.3.3.tar.bz2