Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all mentions of non-existent contrib from .spec files.

Browse Source 
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
2010-10-15 23:46:13 +00:00
parent 2f22b9c260
commit eead52913d
3 changed files with 5 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
wxGTK.spec
View File

@@ -116,7 +116,7 @@ wxBase is a collection of C++ classes providing basic data structures (strings,
lists, arrays), portable wrappers around many OS-specific funstions (file lists, arrays), portable wrappers around many OS-specific funstions (file
operations, time/date manipulations, threads, processes, sockets, shared operations, time/date manipulations, threads, processes, sockets, shared
library loading) as well as other utility classes (streams, archive and library loading) as well as other utility classes (streams, archive and
compression). wxBase currently supports Win32, most Unix variants (Linux, compression). wxBase currently supports Win32, most Unix variants (Linux,
FreeBSD, Solaris, HP-UX) and MacOS X (Carbon and Mach-0). FreeBSD, Solaris, HP-UX) and MacOS X (Carbon and Mach-0).
%package -n %{wxbasename}-devel %package -n %{wxbasename}-devel
@@ -128,23 +128,6 @@ Provides: wxBase-devel
wxBase library - non-GUI support classes of the wxWidgets toolkit, wxBase library - non-GUI support classes of the wxWidgets toolkit,
header files. 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 %prep
%setup -q -n wxGTK-%{ver} %setup -q -n wxGTK-%{ver}
@@ -171,9 +154,7 @@ cd obj-shared
--with-opengl --with-opengl
$MAKE $MAKE
cd contrib/src cd ..
$MAKE
cd ../../..
mkdir obj-static mkdir obj-static
cd obj-static cd obj-static
@@ -192,9 +173,7 @@ cd obj-static
--with-opengl --with-opengl
$MAKE $MAKE
cd contrib/src cd ..
$MAKE
cd ../../..
make -C locale allmo 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} cp -f -r $RPM_BUILD_ROOT/_save_dir/* $RPM_BUILD_ROOT%{_includedir}
rm -rf $RPM_BUILD_ROOT/_save_dir 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: # utils:
(cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install) (cd obj-shared/utils/wxrc; make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install)
@@ -590,18 +565,6 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
%postun gl %postun gl
/sbin/ldconfig /sbin/ldconfig
%post contrib
/sbin/ldconfig
%postun contrib
/sbin/ldconfig
%post contrib-devel
/sbin/ldconfig
%postun contrib-devel
/sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING.LIB *.txt %doc COPYING.LIB *.txt
@@ -675,67 +638,3 @@ rm -f %{_bindir}/%{wxbaseconfiglink}
%files gl %files gl
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libwx_%{buildname}_gl-%{ver2}.so.* %{_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
View File

@@ -59,23 +59,6 @@ Requires: %{name}-devel = %{ver}
%description static %description static
Static libraries for wxMotif. You need them if you want to link statically against wxMotif. 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 %prep
%setup -q -n wxMotif-%{ver} %setup -q -n wxMotif-%{ver}
@@ -90,10 +73,7 @@ mkdir obj-shared
cd obj-shared cd obj-shared
../configure --prefix=%{pref} --with-motif --with-opengl ../configure --prefix=%{pref} --with-motif --with-opengl
$MAKE $MAKE
cd ..
cd contrib/src
$MAKE
cd ../../..
mkdir obj-static mkdir obj-static
cd obj-static cd obj-static
@@ -297,10 +277,6 @@ done
# list of all core headers: # list of all core headers:
find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files 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: # 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%{_libdir}/libwx_base*
rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/* rm -f $RPM_BUILD_ROOT%{_datadir}/aclocal/*
@@ -341,18 +317,6 @@ rm -f %{_bindir}/%{wxconfiglink}
%postun gl %postun gl
/sbin/ldconfig /sbin/ldconfig
%post contrib
/sbin/ldconfig
%postun contrib
/sbin/ldconfig
%post contrib-devel
/sbin/ldconfig
%postun contrib-devel
/sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING.LIB *.txt %doc COPYING.LIB *.txt
@@ -385,52 +349,3 @@ rm -f %{_bindir}/%{wxconfiglink}
%defattr (-,root,root) %defattr (-,root,root)
%{_libdir}/libwx_%{portname}*_*-%{ver2}.a %{_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
View File

@@ -72,23 +72,6 @@ Requires: %{name}-devel = %{ver}
%description static %description static
Static libraries for wxX11. You need them if you want to link statically against wxX11. 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 %prep
%setup -q -n wxX11-%{ver} %setup -q -n wxX11-%{ver}
@@ -108,10 +91,7 @@ cd obj-shared
--disable-unicode \ --disable-unicode \
%endif %endif
$MAKE $MAKE
cd ..
cd contrib/src
$MAKE
cd ../../..
mkdir obj-static mkdir obj-static
cd obj-static cd obj-static
@@ -321,10 +301,6 @@ done
# list of all core headers: # list of all core headers:
find $RPM_BUILD_ROOT%{_includedir}/wx-%{ver2} -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >core-headers.files 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: # 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%{_libdir}/libwx_base*
%if %{unicode} %if %{unicode}
@@ -368,18 +344,6 @@ rm -f %{_bindir}/%{wxconfiglink}
%postun gl %postun gl
/sbin/ldconfig /sbin/ldconfig
%post contrib
/sbin/ldconfig
%postun contrib
/sbin/ldconfig
%post contrib-devel
/sbin/ldconfig
%postun contrib-devel
/sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING.LIB *.txt %doc COPYING.LIB *.txt
@@ -412,52 +376,3 @@ rm -f %{_bindir}/%{wxconfiglink}
%defattr (-,root,root) %defattr (-,root,root)
%{_libdir}/libwx_%{portname}*_*-%{ver2}.a %{_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