- rebuild ac/am/lt (needed for proper C++ library linking)

- added am18 patch (sdlmm.m4 quotation fix), BR+R libstdc++-devel
- release 6

Changed files:
    SDLmm.spec -> 1.20

diff --git a/SDLmm.spec b/SDLmm.spec
index 1b8258e1806114881277d165aaedd43ba5093fc7..4409b133741e725a84a670667c5b31ffa791a1a5 100644 (file)
--- a/SDLmm.spec
+++ b/SDLmm.spec
@@ -2,16 +2,18 @@ Summary:      C++ glue to SDL (Simple DirectMedia Layer)
 Summary(pl):   Interfejs C++ do SDL
 Name:          SDLmm
 Version:       0.1.8
-Release:       5
+Release:       6
 License:       LGPL
 Group:         X11/Libraries
 Source0:       http://dl.sourceforge.net/sdlmm/%{name}-%{version}.tar.bz2
 # Source0-md5: 0a05d27d1aed72af3c7a37b6378f50e5
+Patch0:                %{name}-am18.patch
 URL:           http://sdlmm.sourceforge.net/
 BuildRequires: SDL-devel
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: libstdc++-devel
+BuildRequires: libtool >= 2:1.4d
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -28,8 +30,9 @@ wci
 Summary:       Header files and more to develop SDLmm applications
 Summary(pl):   Pliki nag³ówkowe do rozwijania aplikacji u¿ywaj±cych SDLmm
 Group:         X11/Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{version}-%{release}
 Requires:      SDL-devel
+Requires:      libstdc++-devel
 
 %description devel
 Header files and more to develop SDLmm applications.
@@ -41,7 +44,7 @@ Pliki nag
 Summary:       Static SDLmm libraries
 Summary(pl):   Statyczne biblioteki SDLmm
 Group:         X11/Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
 Statis SDL_image libraries.
@@ -51,15 +54,20 @@ Statyczne biblioteki SDL_image.
 
 %prep
 %setup -q
+%patch0 -p1
+
+# kill sinclude and copy of libtool.m4
+tail -n +3 acinclude.m4 | head -n 176 > acinclude.m4.tmp
+mv -f acinclude.m4.tmp acinclude.m4
 
 %build
-#rm -f missing
-#%{__libtoolize}
-#%{__aclocal}
-#%{__autoconf}
-#%{__automake}
-%configure2_13
-%{__make}
+%{__libtoolize}
+%{__aclocal} -I .
+%{__autoconf}
+%{__automake}
+%configure
+%{__make} \
+       CXXFLAGS="-I`pwd`/src -pipe %{rpmcflags} -Woverloaded-virtual -fno-exceptions -fno-rtti -W -Wall -Wno-unused -Wcast-align -I/usr/include/SDL -D_REENTRANT"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/html/*.html docs/html/*.gif docs/html/*.css
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/SDLmm
 %{_aclocaldir}/*
 %{_mandir}/man3/*