Author: qboosh Date: Thu Nov 29 17:16:29 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cleanup
- updated -utils desc (mentioned obsolete utils, not noticed due to glob)
- avoid installing wxmsw locale
---- Files affected:
SPECS:
wxWidgets.spec (1.73 -> 1.74)
---- Diffs:
================================================================
Index: SPECS/wxWidgets.spec
diff -u SPECS/wxWidgets.spec:1.73 SPECS/wxWidgets.spec:1.74
--- SPECS/wxWidgets.spec:1.73 Fri Nov 23 21:39:40 2007
+++ SPECS/wxWidgets.spec Thu Nov 29 18:16:24 2007
@@ -8,11 +8,6 @@
%bcond_with debug # build with \--enable-debug
# (binary incompatible with non-debug)
#
-# Unpackaged files:
-# /usr/bin/wxrc-2.8
-# /usr/share/locale/it/LC_MESSAGES/wxmsw.mo
-#
-
Summary: wxWidgets library
Summary(pl.UTF-8): Biblioteka wxWidgets
Name: wxWidgets
@@ -352,10 +347,10 @@
Obsoletes: wxWindows-utils
%description utils
-Misc utils from wxWidgets project: helpviewer, makegen, etc.
+Misc utils from wxWidgets project: wxemulator, wxrc, etc.
%description utils -l pl.UTF-8
-Różne narzędzia z projektu wxWidgets: helpviewer, makegen itp.
+Różne narzędzia z projektu wxWidgets: wxemulator, wxrc itp.
%package -n wxX11
Summary: wxUniversal-based wxX11 library
@@ -562,7 +557,8 @@
datadir=$RPM_BUILD_ROOT%{_datadir} \
libdir=$RPM_BUILD_ROOT%{_libdir} \
mandir=$RPM_BUILD_ROOT%{_mandir} \
- includedir=$RPM_BUILD_ROOT%{_includedir}
+ includedir=$RPM_BUILD_ROOT%{_includedir} \
+ LOCALE_MSW_LINGUAS=
%{__make} -C contrib/src install \
prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -588,23 +584,15 @@
datadir=$RPM_BUILD_ROOT%{_datadir} \
libdir=$RPM_BUILD_ROOT%{_libdir} \
mandir=$RPM_BUILD_ROOT%{_mandir} \
- includedir=$RPM_BUILD_ROOT%{_includedir}
+ includedir=$RPM_BUILD_ROOT%{_includedir} \
+ LOCALE_MSW_LINGUAS=
if echo $objdir| grep -q disable-unicode ; then
-# install utils/dialoged/src/DialogEd $RPM_BUILD_ROOT%{_bindir}
# 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/makegen/makegen $RPM_BUILD_ROOT%{_bindir}
install utils/wxrc/wxrc $RPM_BUILD_ROOT%{_bindir}
-# install -d $RPM_BUILD_ROOT%{_datadir}/wx/makegen/templates
-# install -m644 utils/makegen/templates/* \
-# $RPM_BUILD_ROOT%{_datadir}/wx/makegen/templates
-# install contrib/utils/wxrcedit/wxrcedit
$RPM_BUILD_ROOT%{_bindir}
-# install -d $RPM_BUILD_ROOT%{_datadir}/wx/wxrcedit
-# install contrib/utils/wxrcedit/df/* \
-# $RPM_BUILD_ROOT%{_datadir}/wx/wxrcedit/
fi
%{__make} -C contrib/src install \
@@ -674,11 +662,11 @@
%dir %{_libdir}/wx
%dir %{_libdir}/wx/include
%dir %{_libdir}/wx/config
-%{_aclocaldir}/*.m4
+%{_aclocaldir}/wxwin.m4
%files -n bakefile-wxWidgets
%defattr(644,root,root,755)
-%{_datadir}/bakefile/presets/*.bkl
+%{_datadir}/bakefile/presets/wx*.bkl
%files examples
%defattr(644,root,root,755)
@@ -772,9 +760,11 @@
%if %{with ansi}
%files utils
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/HelpGen
-%exclude %{_bindir}/wx*-config
+%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-*
%files -n wxX11
%defattr(644,root,root,755)
@@ -833,6 +823,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.74 2007-11-29 17:16:24 qboosh
+- cleanup
+- updated -utils desc (mentioned obsolete utils, not noticed due to glob)
+- avoid installing wxmsw locale
+
Revision 1.73 2007-11-23 20:39:40 jareq
- updated to 2.8.7
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wxWidgets.spec?r1=1.73&r2=1.74&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
