rpms/libzzub/F-8 libzzub-gcc43.patch,NONE,1.1 libzzub.spec,1.6,1.7
Alexander Kahl (akahl)
fedora-extras-commits at redhat.com
Sun Mar 2 14:45:13 UTC 2008
Author: akahl
Update of /cvs/pkgs/rpms/libzzub/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18612/F-8
Modified Files:
libzzub.spec
Added Files:
libzzub-gcc43.patch
Log Message:
* adapted -12 from devel
libzzub-gcc43.patch:
--- NEW FILE libzzub-gcc43.patch ---
diff -up libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp
--- libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/plugins/firesledge_parameq/ParamEq.cpp 2008-03-02 14:35:43.000000000 +0100
@@ -45,6 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite
#include <cassert>
#include <cmath>
#include <cstdio>
+#include <cstring>
#include <zzub/signature.h>
diff -up libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp
--- libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp.gcc43 2008-03-02 14:40:56.000000000 +0100
+++ libzzub-0.2.3/src/plugins/joachims_multi_v2/main.cpp 2008-03-02 14:41:46.000000000 +0100
@@ -17,5 +17,7 @@
#include <algorithm>
+#include <cstring>
+#include <cstdio>
#include "stdlib.h"
#include "math.h"
#include <zzub/signature.h>
diff -up libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 libzzub-0.2.3/src/plugins/lunar/pugxml.h
--- libzzub-0.2.3/src/plugins/lunar/pugxml.h.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/plugins/lunar/pugxml.h 2008-03-02 14:35:43.000000000 +0100
@@ -31,6 +31,8 @@
#include <iostream>
#include <ostream>
#include <string>
+#include <cstring>
+#include <cstdlib>
#include <iterator>
#if defined(PUGOPT_MEMFIL) | defined(PUGOPT_NONSEG)
# include <assert.h>
diff -up libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp
--- libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/plugins/lunar/lunarstd.cpp 2008-03-02 14:35:43.000000000 +0100
@@ -18,6 +18,8 @@
#include <stdarg.h>
#include <cmath>
#include <memory.h>
+#include <cstdlib>
+#include <cstdio>
#include "zzub/plugin.h"
#include "lunarstd.h"
diff -up libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 libzzub-0.2.3/src/plugins/lunar/lunar.cpp
--- libzzub-0.2.3/src/plugins/lunar/lunar.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/plugins/lunar/lunar.cpp 2008-03-02 14:35:43.000000000 +0100
@@ -57,6 +57,7 @@ extern "C" {
#include <stdio.h>
#include <stdlib.h>
#include <string>
+#include <cstring>
#include <list>
#include <algorithm>
#include <map>
diff -up libzzub-0.2.3/src/libzzub/pattern.h.gcc43 libzzub-0.2.3/src/libzzub/pattern.h
--- libzzub-0.2.3/src/libzzub/pattern.h.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/libzzub/pattern.h 2008-03-02 14:35:43.000000000 +0100
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fi
#include "filereader.h"
#ifndef SIZE_T_MAX
+ #include <limits.h>
#define SIZE_T_MAX UINT_MAX
#endif
diff -up libzzub-0.2.3/src/libzzub/common.h.gcc43 libzzub-0.2.3/src/libzzub/common.h
--- libzzub-0.2.3/src/libzzub/common.h.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/libzzub/common.h 2008-03-02 14:35:43.000000000 +0100
@@ -109,6 +109,7 @@ enum LoadProgressType {
#include <list>
#include <map>
#include <vector>
+#include <cstring>
#include <string>
#include <iostream>
#include <assert.h>
diff -up libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 libzzub-0.2.3/src/rtaudio/RtAudio.cpp
--- libzzub-0.2.3/src/rtaudio/RtAudio.cpp.gcc43 2008-03-02 14:35:41.000000000 +0100
+++ libzzub-0.2.3/src/rtaudio/RtAudio.cpp 2008-03-02 14:35:43.000000000 +0100
@@ -47,7 +47,10 @@
#include "RtAudio.h"
#include <iostream>
+#include <cstdlib>
+#include <cstring>
#include <stdio.h>
+#include <limits.h>
// Static variable definitions.
const unsigned int RtApi::MAX_SAMPLE_RATES = 14;
Index: libzzub.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libzzub/F-8/libzzub.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libzzub.spec 20 Nov 2007 10:12:41 -0000 1.6
+++ libzzub.spec 2 Mar 2008 14:44:37 -0000 1.7
@@ -1,6 +1,6 @@
Name: libzzub
Version: 0.2.3
-Release: 10%{?dist}
+Release: 12%{?dist}
Summary: Powerful music sequencing library
Group: System Environment/Libraries
@@ -19,6 +19,7 @@
Patch1: libzzub-sonamefix.patch
Patch2: libzzub-internalflacfix.patch
Patch3: libzzub-doclocationfix.patch
+Patch4: libzzub-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: ppc64
@@ -69,6 +70,14 @@
mac2unix src/libzzub/ccm.cpp src/libzzub/driver.cpp
%patch2 -p1 -b .internalflacfix
%patch3 -p1 -b .doclocationfix
+mac2unix src/libzzub/{pattern,common}.h \
+ src/rtaudio/RtAudio.cpp \
+ src/plugins/lunar/lunarstd.cpp \
+ src/plugins/firesledge_parameq/ParamEq.cpp \
+ src/plugins/joachims_multi_v2/main.cpp \
+ src/plugins/lunar/pugxml.h \
+ src/plugins/lunar/lunar.cpp
+%patch4 -p1 -b .gcc43
%build
@@ -118,7 +127,6 @@
cd src/pyzzub
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
%clean
@@ -146,9 +154,16 @@
%files -n pyzzub
%defattr(-,root,root,-)
-%{python_sitelib}/zzub
+%{python_sitelib}/*
%changelog
+* Sun Mar 2 2008 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-12
+- patch for missing explicit gcc 4.3 includes
+- pyzzub %%files also seizes the python egg now
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.3-11
+- Autorebuild for GCC 4.3
+
* Tue Nov 20 2007 Alexander Kahl <akahl at iconmobile.com> - 0.2.3-10
- updated buildfix patch to drop explicit sse optimizations
- removed JOBS option again since scons supports -j build option
@@ -175,7 +190,7 @@
- fixed double source definition
- adapted modified source tarball w/ mp3 support removed
- added patch to use internal flac support
-- removed INSTALL from %doc
+- removed INSTALL from %%doc
- removed explicit python requirement
- replaced static rm commands with macros
More information about the fedora-extras-commits
mailing list