- add link.patch which should fix some unresolved symbols

[packages/wxWidgets.git] / wxWidgets.spec

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 2881cace023a73a9d86eeddc18c91213a039fb13..6afd9f9bb9a3bcfeea0eecf5dbc2a5f4714806b7 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,17 +10,17 @@
 Summary:       wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.8.8
+Version:       2.9.1
 Release:       1
 License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         X11/Libraries
 Source0:       http://ftp.wxwidgets.org/pub/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 647b94f636db8f3e6ba7170d0d691eb6
+# Source0-md5: 81c20d7b2ba31becb18e467dbe09be8f
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ogl.patch
 Patch2:                %{name}-ac.patch
 Patch3:                %{name}-x11unicode.patch
-Patch4:                %{name}-gcc4.patch
+Patch4:                %{name}-link.patch
 URL:           http://www.wxWidgets.org/
 BuildRequires: OpenGL-GLU-devel
 #BuildRequires:        SDL-devel
@@ -28,7 +28,6 @@ BuildRequires:        autoconf >= 2.59-9
 BuildRequires: automake
 #BuildRequires:        bakefile >= 0.2.1
 BuildRequires: cppunit-devel
-BuildRequires: esound-devel
 BuildRequires: expat-devel
 BuildRequires: flex
 BuildRequires: gettext-devel
@@ -132,19 +131,6 @@ wxWidgets example programs.
 %description examples -l pl.UTF-8
 Przykładowe programy wxWidgets.
 
-%package HelpGen
-Summary:       Help file generator for wxWidgets programs
-Summary(pl.UTF-8):     Generator plików pomocy dla programów wxWidgets
-Group:         Development/Tools
-Requires:      wxBase = %{version}-%{release}
-Obsoletes:     wxWindows-HelpGen
-
-%description HelpGen
-Help file generator for wxWidgets programs.
-
-%description HelpGen -l pl.UTF-8
-Generator plików pomocy dla programów wxWidgets.
-
 %package -n wxBase
 Summary:       wxBase library - non-GUI support classes of wxWidgets toolkit
 Summary(pl.UTF-8):     wxBase - biblioteka klas wxWidgets nie związanych z GUI
@@ -466,7 +452,8 @@ obsługą UNICODE.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# is this still needed?
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -482,7 +469,7 @@ cp -f /usr/share/automake/config.sub .
 %{__aclocal} -I build/aclocal
 %{__autoconf}
 
-CPPFLAGS="%{rpmcflags} -I`pwd`/include"; export CPPFLAGS
+CPPFLAGS="%{rpmcppflags} %{rpmcflags} -I`pwd`/include -fPIC"; export CPPFLAGS
 # avoid adding -s to LDFLAGS
 LDFLAGS=" "; export LDFLAGS
 args="%{?with_debug:--enable-debug}%{!?with_debug:--disable-debug} \
@@ -507,7 +494,6 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                ${unicode} \
                %{!?with_gnomeprint:--without-gnomeprint}
        %{__make}
-       %{__make} -C contrib/src
        cd ..
 done
 
@@ -524,12 +510,10 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                --enable-universal \
                ${unicode}
        %{__make}
-       %{__make} -C contrib/src
        if echo $objdir| grep -q disable-unicode ; then
                %{__make} -C utils
                %{__make} -C utils/emulator
                %{__make} -C utils/hhp2cached
-               # %{__make} -C contrib/utils
        fi
        cd ..
 done
@@ -556,15 +540,6 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                mandir=$RPM_BUILD_ROOT%{_mandir} \
                includedir=$RPM_BUILD_ROOT%{_includedir} \
                LOCALE_MSW_LINGUAS=
-
-       %{__make} -C contrib/src install \
-               prefix=$RPM_BUILD_ROOT%{_prefix} \
-               exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-               bindir=$RPM_BUILD_ROOT%{_bindir} \
-               datadir=$RPM_BUILD_ROOT%{_datadir} \
-               libdir=$RPM_BUILD_ROOT%{_libdir} \
-               mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir}
        cd ..
 done
 
@@ -585,22 +560,10 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                LOCALE_MSW_LINGUAS=
        if echo $objdir| grep -q disable-unicode ; then
                # TODO: install default config files and default backgrouds
-               install utils/HelpGen/src/HelpGen $RPM_BUILD_ROOT%{_bindir}
                install utils/emulator/src/wxemulator $RPM_BUILD_ROOT%{_bindir}
-               install utils/tex2rtf/src/tex2rtf $RPM_BUILD_ROOT%{_bindir}
                install utils/hhp2cached/hhp2cached $RPM_BUILD_ROOT%{_bindir}
                install utils/wxrc/wxrc $RPM_BUILD_ROOT%{_bindir}
        fi
-
-       %{__make} -C contrib/src install \
-               prefix=$RPM_BUILD_ROOT%{_prefix} \
-               exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
-               bindir=$RPM_BUILD_ROOT%{_bindir} \
-               datadir=$RPM_BUILD_ROOT%{_datadir} \
-               libdir=$RPM_BUILD_ROOT%{_libdir} \
-               mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir}
-
        cd ..
 done
 %endif
@@ -649,11 +612,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f wxstd.lang
 %defattr(644,root,root,755)
-%doc docs/{changes,licence,licendoc,preamble,readme,todo}.txt
+%doc docs/{changes,licence,licendoc,preamble,readme}.txt
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/html
 %doc docs/tech docs/univ
 %{_includedir}/wx*
 %dir %{_libdir}/wx
@@ -669,12 +631,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
 
-%if %{with x11}
-%files HelpGen
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/HelpGen
-%endif
-
 %if %{with ansi}
 %files -n wxBase
 %defattr(644,root,root,755)
@@ -758,7 +714,6 @@ rm -rf $RPM_BUILD_ROOT
 %files utils
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/hhp2cached
-%attr(755,root,root) %{_bindir}/tex2rtf
 %attr(755,root,root) %{_bindir}/wxemulator
 %attr(755,root,root) %{_bindir}/wxrc
 %attr(755,root,root) %{_bindir}/wxrc-*