1) use ngettext instead of _N, 2) cleanup of gettext macros definitions

[wxWidgets.git] / wxX11.spec

diff --git a/wxX11.spec b/wxX11.spec
index 2da55fe51afd3d2a0dcb2a0a50e1ecfa160724da..c54305444c05e8e39a75996dd9f95f5f099a8dcf 100644 (file)
--- a/wxX11.spec
+++ b/wxX11.spec
@@ -1,5 +1,5 @@
 %define pref /usr
-%define ver 2.5.0
+%define ver 2.5.1
 %define ver2 2.5
 %define rel 1
 
@@ -165,6 +165,7 @@ wx/dynlib.h
 wx/dynload.h
 wx/encconv.h
 wx/event.h
+wx/except.h
 wx/features.h
 wx/ffile.h
 wx/file.h
@@ -176,6 +177,7 @@ wx/fontenc.h
 wx/fontmap.h
 wx/fs_mem.h
 wx/fs_zip.h
+wx/gzstream.h
 wx/hash.h
 wx/hashmap.h
 wx/hashset.h
@@ -208,6 +210,7 @@ wx/ptr_scpd.h
 wx/regex.h
 wx/scopeguard.h
 wx/snglinst.h
+wx/stack.h
 wx/stopwatch.h
 wx/strconv.h
 wx/stream.h
@@ -274,6 +277,11 @@ find $RPM_BUILD_ROOT/usr/include/wx -type f | sed -e "s,$RPM_BUILD_ROOT,,g" >cor
 (cd obj-shared/contrib/src; make prefix=$RPM_BUILD_ROOT%{pref} install)
 (cd obj-shared/contrib/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/*
+rm -f $RPM_BUILD_ROOT%{_datadir}/locale/*/*/*
+
 %clean
 rm -rf $RPM_BUILD_ROOT