- added c++ fix for wrong type in addString wrapper function; release 6

Changed files:
    ming-c++.patch -> 1.1
    ming.spec -> 1.16

diff --git a/ming-c++.patch b/ming-c++.patch
new file mode 100644 (file)
index 0000000..7e6ab71
--- /dev/null
+++ b/ming-c++.patch
@@ -0,0 +1,11 @@
+--- ming-0.2a/mingpp.h.orig    Fri Aug 17 19:06:16 2001
++++ ming-0.2a/mingpp.h Thu Dec 19 08:13:55 2002
+@@ -627,7 +627,7 @@
+   void setColor(unsigned char r, unsigned char g, unsigned char b, int a=0xff)
+     { SWFText_setColor(this->text, r, g, b, a); }
+ 
+-  void addString(const char *string, float *advance=NULL)
++  void addString(const char *string, int *advance=NULL)
+     { SWFText_addString(this->text, string, advance); }
+ 
+   void setSpacing(float spacing)

diff --git a/ming.spec b/ming.spec
index 594a7dd56f67fa26ce60c9d66aadfe4cc6a0bf53..929e9d61f8dcbc36bd1c6fb14a962b339d8de885 100644 (file)
--- a/ming.spec
+++ b/ming.spec
@@ -1,12 +1,10 @@
-
 %include       /usr/lib/rpm/macros.perl
 %include       /usr/lib/rpm/macros.python
-
 Summary:       Ming - an SWF output library
 Summary(pl):   Ming - biblioteka do produkcji plików SWF
 Name:          ming
 Version:       0.2a
-Release:       5
+Release:       6
 License:       LGPL
 Vendor:                Opaque Industries
 Group:         Libraries
@@ -14,6 +12,7 @@ Source0:      http://www.opaque.net/ming/%{name}-%{version}.tgz
 Patch0:                %{name}-dynamic-exts.patch
 Patch1:                %{name}-soname.patch
 Patch2:                %{name}-python.patch
+Patch3:                %{name}-c++.patch
 URL:           http://www.opaque.net/ming/
 BuildRequires: python-devel
 BuildRequires: rpm-perlprov >= 4.0.2-24
@@ -21,8 +20,6 @@ BuildRequires:        rpm-pythonprov
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                phpextdir       %(php-config --extension-dir)
-
 %description
 Ming is a C library for generating SWF ("Flash") format movies, plus a
 set of wrappers for using the library from c++ and popular scripting
@@ -95,6 +92,7 @@ Narz
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} CC="%{__cc}" CFLAGS="%{rpmcflags}"