- cxx fixes for gcc 8

[packages/agg.git] / agg.spec

diff --git a/agg.spec b/agg.spec
index 82f9404f1674f5335b26740ee84fb82a3b63afc2..917b8210eb5f01d67f9d934e710879e6d9db52fe 100644 (file)
--- a/agg.spec
+++ b/agg.spec
@@ -2,21 +2,28 @@ Summary:      A High Quality Rendering Engine for C++
 Summary(pl.UTF-8):     Silnik renderujący wysokiej jakości dla C++
 Name:          agg
 Version:       2.5
-Release:       0.1
+Release:       8
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://www.antigrain.com/%{name}-%{version}.tar.gz
 # Source0-md5: ddc67cbdc7d51e1ec984c2ac2724c08a
 Patch0:                %{name}-depends.patch
+Patch1:                ac.patch
+Patch2:                cxx.patch
 URL:           http://www.antigrain.com/
 BuildRequires: SDL-devel
-BuildRequires: XFree86-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: freetype-devel
+BuildRequires: libstdc++-devel
 BuildRequires: libtool
+BuildRequires: pkgconfig
+BuildRequires: xorg-lib-libX11-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# Unresolved symbol: _Z8agg_mainiPPc
+%define                skip_post_check_so      libaggplatformsdl.so.*.*.* libaggplatformX11.so.*.*.* libaggplatformsdl.so.*.*.*
+
 %description
 Anti-Grain Geometry (AGG) is a general purpose graphical toolkit
 written completely in standard and platform independent C++. It can be
@@ -44,6 +51,10 @@ Summary:     Support files necessary to compile applications with agg
 Summary(pl.UTF-8):     Pliki potrzebne do kompilowania aplikacji z użyciem agg
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      libstdc++-devel
+# libaggfontfreetype R: freetype-devel
+# libaggplatformX11 R: xorg-lib-libX11-devel
+# libaggplatformsdl R: SDL-devel
 
 %description devel
 Header and support files necessary to compile applications using agg.
@@ -67,16 +78,20 @@ Statyczna biblioteka agg.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
-%{__libtoolize}
 %{__automake}
 %configure \
-       --disable-gpc
-%{__make}
+       --disable-gpc \
+       --disable-examples
+
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,16 +108,32 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc authors copying readme
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libagg.so.*.*.*
+%ghost %{_libdir}/libagg.so.2
+%attr(755,root,root) %{_libdir}/libaggfontfreetype.so.*.*.*
+%ghost %{_libdir}/libaggfontfreetype.so.2
+%attr(755,root,root) %{_libdir}/libaggplatformX11.so.*.*.*
+%ghost %{_libdir}/libaggplatformX11.so.2
+%attr(755,root,root) %{_libdir}/libaggplatformsdl.so.*.*.*
+%ghost %{_libdir}/libaggplatformsdl.so.2
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/*.la
+%{_libdir}/libagg.so
+%{_libdir}/libaggfontfreetype.so
+%{_libdir}/libaggplatformX11.so
+%{_libdir}/libaggplatformsdl.so
+%{_libdir}/libagg.la
+%{_libdir}/libaggfontfreetype.la
+%{_libdir}/libaggplatformX11.la
+%{_libdir}/libaggplatformsdl.la
 %{_includedir}/agg2
 %{_pkgconfigdir}/libagg.pc
 %{_aclocaldir}/libagg.m4
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/libagg.a
+%{_libdir}/libaggfontfreetype.a
+%{_libdir}/libaggplatformX11.a
+%{_libdir}/libaggplatformsdl.a