rpms/ncmpcpp/devel ncmpcpp-0.3.2-charset.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 import.log, 1.3, 1.4 ncmpcpp.spec, 1.4, 1.5 sources, 1.4, 1.5
Michal Nowak
mnowak at fedoraproject.org
Wed Mar 18 08:40:35 UTC 2009
Author: mnowak
Update of /cvs/pkgs/rpms/ncmpcpp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13294/devel
Modified Files:
.cvsignore import.log ncmpcpp.spec sources
Added Files:
ncmpcpp-0.3.2-charset.patch
Log Message:
0.3.2
ncmpcpp-0.3.2-charset.patch:
--- NEW FILE ncmpcpp-0.3.2-charset.patch ---
From: Andrzej Rybczak <electricityispower at 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
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 23 Feb 2009 09:59:25 -0000 1.4
+++ .cvsignore 18 Mar 2009 08:40:04 -0000 1.5
@@ -1 +1 @@
-ncmpcpp-0.3.1.tar.bz2
+ncmpcpp-0.3.2.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log 23 Feb 2009 09:59:25 -0000 1.3
+++ import.log 18 Mar 2009 08:40:04 -0000 1.4
@@ -1,3 +1,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
Index: ncmpcpp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/ncmpcpp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ncmpcpp.spec 26 Feb 2009 04:36:35 -0000 1.4
+++ ncmpcpp.spec 18 Mar 2009 08:40:04 -0000 1.5
@@ -1,11 +1,12 @@
Name: ncmpcpp
-Version: 0.3.1
-Release: 2%{?dist}
+Version: 0.3.2
+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
@@ -22,6 +23,9 @@
%prep
%setup -q
+# upstream patch, compilation was failing
+# --> http://repo.or.cz/w/ncmpcpp.git?a=commitdiff;h=503c4964d56a1140331d02c0f56dfc7efb733c40#patch1
+%patch0 -p1
%build
@@ -44,9 +48,14 @@
%defattr(-,root,root,-)
%doc doc/config doc/keys AUTHORS NEWS COPYING
%{_bindir}/ncmpcpp
+%{_mandir}/man1/%{name}*
%changelog
+* Wed Mar 18 2009 Michal Nowak <mnowak at redhat.com> - 0.3.2-1
+- 0.3.2
+- added ncmpcpp man page
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ncmpcpp/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 23 Feb 2009 09:59:25 -0000 1.4
+++ sources 18 Mar 2009 08:40:04 -0000 1.5
@@ -1 +1 @@
-0ac67665faece8d7a193f3dcfa28e398 ncmpcpp-0.3.1.tar.bz2
+e2159a391b21d3fcf9a4613f589fb213 ncmpcpp-0.3.2.tar.bz2
More information about the scm-commits
mailing list