- switch to bz2 (7z has dos-ending files; bz2 unix-ending files); fix merge

diff --git a/wxWidgets.spec b/wxWidgets.spec
index 968eb4b82bdcde5de95aae91aea335ba8da95cbb..3826fc59abad692b0c94ce0ecc76bc9b22193f4e 100644 (file)
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -14,8 +14,8 @@ Version:      3.0.0
 Release:       1
 License:       wxWindows Library Licence 3.1 (LGPL v2+ with exception)
 Group:         X11/Libraries
-Source0:       http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.7z
-# Source0-md5: 294362f2a7407547b6819748896b1632
+Source0:       http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
+# Source0-md5: 241998efc12205172ed24c18788ea2cd
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ac.patch
 Patch2:                %{name}-link.patch
@@ -135,19 +135,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
@@ -467,15 +454,13 @@ Pliki programistyczne biblioteki GL dla opartej na wxUniversal wxX11 z
 obsługą UNICODE.
 
 %prep
-%setup -q -c
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
 %{__rm} build/aclocal/bakefile*.m4
 
-%undos src/stc/gen_iface.py
-
 %build
 # if bakefiles rebuild is needed:
 #%if "%(rpm -q bakefile --qf '%%{VERSION}')" != "0.2.1"
@@ -517,7 +502,6 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                --with-gtkprint \
                %{!?with_gnomeprint:--without-gnomeprint}
        %{__make}
-       %{__make} -C contrib/src
        cd ..
 done
 
@@ -534,7 +518,6 @@ 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
@@ -566,15 +549,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
 
@@ -595,22 +569,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
@@ -659,11 +621,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
@@ -679,12 +640,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)
@@ -768,7 +723,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-*