Remove all mentions of non-existent contrib from .spec files.
Remove contrib packages from .spec files. Closes #12567. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
2f22b9c260
commit
eead52913d
105
wxGTK.spec
105
wxGTK.spec
@ -128,23 +128,6 @@ Provides: wxBase-devel
|
||||
wxBase library - non-GUI support classes of the wxWidgets toolkit,
|
||||
header files.
|
||||
|
||||
%package contrib
|
||||
Summary: The GTK+ %{gtkver} port of the wxWidgets library, contributed libraries.
|
||||
Group: X11/Libraries
|
||||
Requires: %{name} = %{ver}
|
||||
|
||||
%description contrib
|
||||
Contributed libraries for wxGTK, the GTK+ %{gtkver} port of the wxWidgets library.
|
||||
|
||||
%package contrib-devel
|
||||
Summary: The GTK+ %{gtkver} port of the wxWidgets library
|
||||
Group: X11/Libraries
|
||||
Requires: %{name}-contrib = %{ver}
|
||||
Requires: %{name}-devel = %{ver}
|
||||
|
||||
%description contrib-devel
|
||||
Header files for contributed libraries for wxGTK, the GTK+ %{gtkver} port of the wxWidgets library.
|
||||
|
||||
%prep
|
||||
%setup -q -n wxGTK-%{ver}
|
||||
|
||||
@ -171,9 +154,7 @@ cd obj-shared
|
||||
--with-opengl
|
||||
$MAKE
|
||||
|
||||
cd contrib/src
|
||||
$MAKE
|
||||
cd ../../..
|
||||
cd ..
|
||||
|
||||
mkdir obj-static
|
||||
cd obj-static
|
||||
@ -192,9 +173,7 @@ cd obj-static
|
||||
--with-opengl
|
||||
$MAKE
|
||||
|
||||
cd contrib/src
|
||||
$MAKE
|
||||
cd ../../..
|
||||
cd ..
|
||||
|
||||
make -C locale allmo
|
||||
|
||||
@ -530,10 +509,6 @@ find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROO
|
||||
cp -f -r $RPM_BUILD_ROOT/_save_dir/* $RPM_BUILD_ROOT%{_includedir}
|
||||
rm -rf $RPM_BUILD_ROOT/_save_dir
|
||||
|
||||
# contrib stuff:
|
||||
(cd obj-static/contrib; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install)
|
||||
(cd obj-shared/contrib; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install)
|
||||
|
||||
# utils:
|
||||
(cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install)
|
||||
|
||||
@ -590,18 +565,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
|
||||
%postun gl
|
||||
/sbin/ldconfig
|
||||
|
||||
%post contrib
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun contrib
|
||||
/sbin/ldconfig
|
||||
|
||||
%post contrib-devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun contrib-devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING.LIB *.txt
|
||||
@ -675,67 +638,3 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
|
||||
%files gl
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libwx_%{buildname}_gl-%{ver2}.so.*
|
||||
|
||||
%files contrib
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libwx_%{buildname}_animate-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_fl-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_plot-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_stc-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{buildname}_svg-%{ver2}.so.*
|
||||
|
||||
# static libs
|
||||
%{_libdir}/libwx_%{buildname}_animate-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_fl-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_plot-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_stc-%{ver2}.a
|
||||
%{_libdir}/libwx_%{buildname}_svg-%{ver2}.a
|
||||
|
||||
%files contrib-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/animate
|
||||
%{_includedir}/wx-%{ver2}/wx/animate/*
|
||||
%{_libdir}/libwx_%{buildname}_animate-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/deprecated
|
||||
%{_includedir}/wx-%{ver2}/wx/deprecated/*
|
||||
%{_libdir}/libwx_%{buildname}_deprecated-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/fl
|
||||
%{_includedir}/wx-%{ver2}/wx/fl/*
|
||||
%{_libdir}/libwx_%{buildname}_fl-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/gizmos
|
||||
%{_includedir}/wx-%{ver2}/wx/gizmos/*
|
||||
%{_libdir}/libwx_%{buildname}_gizmos-%{ver2}.so
|
||||
%{_libdir}/libwx_%{buildname}_gizmos_xrc-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/mmedia
|
||||
%{_includedir}/wx-%{ver2}/wx/mmedia/*
|
||||
%{_libdir}/libwx_%{buildname}_mmedia-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/ogl
|
||||
%{_includedir}/wx-%{ver2}/wx/ogl/*
|
||||
%{_libdir}/libwx_%{buildname}_ogl-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/plot
|
||||
%{_includedir}/wx-%{ver2}/wx/plot/*
|
||||
%{_libdir}/libwx_%{buildname}_plot-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/stc
|
||||
%{_includedir}/wx-%{ver2}/wx/stc/*
|
||||
%{_libdir}/libwx_%{buildname}_stc-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/svg
|
||||
%{_includedir}/wx-%{ver2}/wx/svg/*
|
||||
%{_libdir}/libwx_%{buildname}_svg-%{ver2}.so
|
||||
|
||||
87
wxMotif.spec
87
wxMotif.spec
@ -59,23 +59,6 @@ Requires: %{name}-devel = %{ver}
|
||||
%description static
|
||||
Static libraries for wxMotif. You need them if you want to link statically against wxMotif.
|
||||
|
||||
%package contrib
|
||||
Summary: Contrib libraries for wxMotif
|
||||
Group: X11/Libraries
|
||||
Requires: %{name} = %{ver}
|
||||
|
||||
%description contrib
|
||||
Contrib libraries for wxMotif
|
||||
|
||||
%package contrib-devel
|
||||
Summary: Contrib libraries for wxMotif
|
||||
Group: X11/Libraries
|
||||
Requires: %{name}-contrib = %{ver}
|
||||
Requires: %{name}-devel = %{ver}
|
||||
|
||||
%description contrib-devel
|
||||
Header files for contributed libraries for wxMotif.
|
||||
|
||||
%prep
|
||||
%setup -q -n wxMotif-%{ver}
|
||||
|
||||
@ -90,10 +73,7 @@ mkdir obj-shared
|
||||
cd obj-shared
|
||||
../configure --prefix=%{pref} --with-motif --with-opengl
|
||||
$MAKE
|
||||
|
||||
cd contrib/src
|
||||
$MAKE
|
||||
cd ../../..
|
||||
cd ..
|
||||
|
||||
mkdir obj-static
|
||||
cd obj-static
|
||||
@ -297,10 +277,6 @@ done
|
||||
# list of all core headers:
|
||||
find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
|
||||
|
||||
# contrib stuff:
|
||||
(cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
|
||||
(cd obj-shared/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install)
|
||||
|
||||
# remove wxBase files so that RPM doesn't complain about unpackaged files:
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/*
|
||||
@ -341,18 +317,6 @@ rm -f %{_bindir}/%{wxconfiglink}
|
||||
%postun gl
|
||||
/sbin/ldconfig
|
||||
|
||||
%post contrib
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun contrib
|
||||
/sbin/ldconfig
|
||||
|
||||
%post contrib-devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun contrib-devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING.LIB *.txt
|
||||
@ -385,52 +349,3 @@ rm -f %{_bindir}/%{wxconfiglink}
|
||||
%defattr (-,root,root)
|
||||
%{_libdir}/libwx_%{portname}*_*-%{ver2}.a
|
||||
|
||||
%files contrib
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so.*
|
||||
|
||||
%files contrib-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/animate
|
||||
%{_includedir}/wx-%{ver2}/wx/animate/*
|
||||
%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/deprecated
|
||||
%{_includedir}/wx-%{ver2}/wx/deprecated/*
|
||||
%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/fl
|
||||
%{_includedir}/wx-%{ver2}/wx/fl/*
|
||||
%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/gizmos
|
||||
%{_includedir}/wx-%{ver2}/wx/gizmos/*
|
||||
%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/mmedia
|
||||
%{_includedir}/wx-%{ver2}/wx/mmedia/*
|
||||
%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/ogl
|
||||
%{_includedir}/wx-%{ver2}/wx/ogl/*
|
||||
%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/plot
|
||||
%{_includedir}/wx-%{ver2}/wx/plot/*
|
||||
%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/stc
|
||||
%{_includedir}/wx-%{ver2}/wx/stc/*
|
||||
%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/svg
|
||||
%{_includedir}/wx-%{ver2}/wx/svg/*
|
||||
%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so
|
||||
|
||||
87
wxX11.spec
87
wxX11.spec
@ -72,23 +72,6 @@ Requires: %{name}-devel = %{ver}
|
||||
%description static
|
||||
Static libraries for wxX11. You need them if you want to link statically against wxX11.
|
||||
|
||||
%package contrib
|
||||
Summary: Contrib libraries for wxX11.
|
||||
Group: X11/Libraries
|
||||
Requires: %{name} = %{ver}
|
||||
|
||||
%description contrib
|
||||
Contributed libraries for wxX11.
|
||||
|
||||
%package contrib-devel
|
||||
Summary: Contrib libraries for wxX11.
|
||||
Group: X11/Libraries
|
||||
Requires: %{name}-contrib = %{ver}
|
||||
Requires: %{name}-devel = %{ver}
|
||||
|
||||
%description contrib-devel
|
||||
Header files for contributed libraries for wxX11.
|
||||
|
||||
%prep
|
||||
%setup -q -n wxX11-%{ver}
|
||||
|
||||
@ -108,10 +91,7 @@ cd obj-shared
|
||||
--disable-unicode \
|
||||
%endif
|
||||
$MAKE
|
||||
|
||||
cd contrib/src
|
||||
$MAKE
|
||||
cd ../../..
|
||||
cd ..
|
||||
|
||||
mkdir obj-static
|
||||
cd obj-static
|
||||
@ -321,10 +301,6 @@ done
|
||||
# list of all core headers:
|
||||
find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files
|
||||
|
||||
# contrib stuff:
|
||||
(cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
|
||||
(cd obj-shared/utils/wxrc; make prefix=$RPM_BUILD_ROOT%{pref} install)
|
||||
|
||||
# remove wxBase files so that RPM doesn't complain about unpackaged files:
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/libwx_base*
|
||||
%if %{unicode}
|
||||
@ -368,18 +344,6 @@ rm -f %{_bindir}/%{wxconfiglink}
|
||||
%postun gl
|
||||
/sbin/ldconfig
|
||||
|
||||
%post contrib
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun contrib
|
||||
/sbin/ldconfig
|
||||
|
||||
%post contrib-devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun contrib-devel
|
||||
/sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING.LIB *.txt
|
||||
@ -412,52 +376,3 @@ rm -f %{_bindir}/%{wxconfiglink}
|
||||
%defattr (-,root,root)
|
||||
%{_libdir}/libwx_%{portname}*_*-%{ver2}.a
|
||||
|
||||
%files contrib
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so.*
|
||||
%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so.*
|
||||
|
||||
%files contrib-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/animate
|
||||
%{_includedir}/wx-%{ver2}/wx/animate/*
|
||||
%{_libdir}/libwx_%{portname}*_animate-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/deprecated
|
||||
%{_includedir}/wx-%{ver2}/wx/deprecated/*
|
||||
%{_libdir}/libwx_%{portname}*_deprecated-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/fl
|
||||
%{_includedir}/wx-%{ver2}/wx/fl/*
|
||||
%{_libdir}/libwx_%{portname}*_fl-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/gizmos
|
||||
%{_includedir}/wx-%{ver2}/wx/gizmos/*
|
||||
%{_libdir}/libwx_%{portname}*_gizmos-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/mmedia
|
||||
%{_includedir}/wx-%{ver2}/wx/mmedia/*
|
||||
%{_libdir}/libwx_%{portname}*_mmedia-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/ogl
|
||||
%{_includedir}/wx-%{ver2}/wx/ogl/*
|
||||
%{_libdir}/libwx_%{portname}*_ogl-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/plot
|
||||
%{_includedir}/wx-%{ver2}/wx/plot/*
|
||||
%{_libdir}/libwx_%{portname}*_plot-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/stc
|
||||
%{_includedir}/wx-%{ver2}/wx/stc/*
|
||||
%{_libdir}/libwx_%{portname}*_stc-%{ver2}.so
|
||||
|
||||
%dir %{_includedir}/wx-%{ver2}/wx/svg
|
||||
%{_includedir}/wx-%{ver2}/wx/svg/*
|
||||
%{_libdir}/libwx_%{portname}*_svg-%{ver2}.so
|
||||
|
||||
Loading…
Reference in New Issue
Block a user