Hello community,
here is the log from the commit of package wxGTK
checked in at Wed Aug 29 22:47:27 CEST 2007.
--------
--- wxGTK/wxGTK.changes 2007-05-23 17:39:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/wxGTK/wxGTK.changes 2007-08-29 16:55:31.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Aug 29 15:26:22 CEST 2007 - prusnak@suse.cz
+
+- pack non-unicode libraries as wxGTK-compat package (again)
+- run ldconfig in post/postun scriptlets
+
+-------------------------------------------------------------------
New:
----
README.unicode
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wxGTK.spec ++++++
--- /var/tmp/diff_new_pack.F31280/_old 2007-08-29 22:46:59.000000000 +0200
+++ /var/tmp/diff_new_pack.F31280/_new 2007-08-29 22:46:59.000000000 +0200
@@ -14,19 +14,20 @@
%define srcname wxPython-src
%define wx_version 2.8
BuildRequires: SDL-devel cppunit-devel esound-devel gcc-c++ gtk2-devel libgnomeprintui-devel libmspack-devel libtiff-devel python-devel python-xml unixODBC-devel
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Libraries
Autoreqprov: on
Version: 2.8.4.0
-Release: 1
+Release: 39
Summary: C++ Framework for Cross-Platform Development
# Source from http://www.wxpython.org/
Source0: %{srcname}-%{version}.tar.bz2
# some files need to be removed from source:
# * contrib/samples/applet/monitor.c [#203607]
# * wxPython/distrib/msw/*.{dll,DLL} [#226403]
-# use this script to automaticaly clean tarball
+# use this script to automaticaly clean tarball:
Source1: clean-tarball.sh
+Source2: README.unicode
URL: http://www.wxwidgets.org/
Provides: wxgtk
Obsoletes: wxgtk
@@ -59,7 +60,9 @@
Summary: Everything needed for development with wxGTK
Group: Development/Libraries/GNOME
Provides: wxgtk:/usr/bin/wx-config
-Requires: wxGTK wxGTK-gl gtk2-devel
+Requires: wxGTK = %{version}
+Requires: wxGTK-gl = %{version}
+Requires: gtk2-devel
%description devel
This package contains all files needed for developing with wxGTK
@@ -86,6 +89,27 @@
--------
Robert Roebling
+%package compat
+Summary: Non-Unicode wxWidgets Compatibility Package
+Group: System/Libraries
+Requires: wxGTK
+
+%description compat
+wxWidgets is a free C++ framework to make cross-platform programming
+easy. It supports Windows 3.1/95/98/NT, and UNIX with
+GTK/Motif/Lesstif. This is the version for GTK+. This package only
+contains the runtime libraries and other data needed by the runtime
+libraries.
+
+This package contains a library compiled without Unicode support, which
+is needed for some improperly written applications.
+
+
+
+Authors:
+--------
+ Robert Roebling
+
%package -n python-wxGTK
Group: Development/Libraries/Python
Requires: wxGTK
@@ -115,15 +139,51 @@
%patch1
%patch2
%patch3
+cp %{S:2} .
+mkdir wxWidgets-unicode
+mkdir wxWidgets-ansi
%build
%{suse_update_config -f}
autoconf
-mkdir wxWidgets
-cd wxWidgets
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
-export CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
-export CPPFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="$RPM_OPT_FLAGS -fPIC -fno-strict-aliasing"
+export CXXFLAGS="$CFLAGS"
+export CPPFLAGS="$CFLAGS"
+# build ANSI version
+pushd wxWidgets-ansi
+../configure \
+ --prefix=%{_prefix} \
+ --datadir=%{_datadir} \
+ --libdir=%{_libdir} \
+ --enable-rpath=%{_libdir} \
+ --enable-burnt_name \
+ --with-opengl \
+ --with-libmspack \
+ --with-odbc \
+ --with-sdl \
+ --enable-sound \
+ --with-gnomeprint \
+ --enable-iff \
+ --enable-geometry \
+ --enable-optimise \
+ --enable-soname \
+ --enable-gtk2 \
+%if %{usedebug}
+ --enable-debug \
+%endif
+ --disable-unicode \
+ --enable-controls \
+ --enable-calendar \
+ --enable-tabdialog \
+ --enable-std_iostreams
+# breaks wxPython: --enable-stl \
+# breaks SDL: --enable-plugins \
+# can support maemo hildon
+make %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs} -C contrib
+popd
+# build Unicode version
+pushd wxWidgets-unicode
../configure \
--prefix=%{_prefix} \
--datadir=%{_datadir} \
@@ -154,12 +214,20 @@
# can support maemo hildon
make %{?jobs:-j%jobs}
make %{?jobs:-j%jobs} -C contrib
+popd
%install
-pushd wxWidgets
+# install ANSI version
+pushd wxWidgets-ansi
+make DESTDIR=$RPM_BUILD_ROOT install
+make -C contrib DESTDIR=$RPM_BUILD_ROOT install
+popd
+# install Unicode version (after ANSI!)
+pushd wxWidgets-unicode
make DESTDIR=$RPM_BUILD_ROOT install
make -C contrib DESTDIR=$RPM_BUILD_ROOT install
popd
+# wxPython
export CFLAGS="$RPM_OPT_FLAGS -I$RPM_BUILD_ROOT%{_libdir}/wx/include/gtk2-unicode-release-2.8"
export CXXFLAGS="$CFLAGS"
export LDFLAGS=-L$RPM_BUILD_ROOT%{_libdir}
@@ -179,38 +247,54 @@
sed -i 's/^WX_CONFIG=.*/WX_CONFIG="wx-config --unicode"/' $RPM_BUILD_ROOT$build_options
python -c "import py_compile; py_compile.compile('$RPM_BUILD_ROOT$build_options', None, '$build_options', True);"
popd
-################################################################################
-# generate library list
-################################################################################
+# generate filelists
(cd $RPM_BUILD_ROOT; ls .%{_libdir}/libwx_*.so.*) | grep -v _gl- | sed 's/^\.//' > FILELIST
%if %{usedebug}
%define mask ud
%else
%define mask u
%endif
-grep '%{mask}[-_]' FILELIST > FILELIST.normal
+grep '%{mask}[-_]' FILELIST > FILELIST.unicode
+grep -v '%{mask}[-_]' FILELIST > FILELIST.ansi
(cd $RPM_BUILD_ROOT; ls .%{_libdir}/libwx_*.so.*) | grep _gl- | sed 's/^\.//' > FILELIST.gl
(cd $RPM_BUILD_ROOT; find .%{_includedir}/wx-%{wx_version}/wx -type f -maxdepth 1) | grep -v /wxPython | sed 's/^\.//' > FILELIST.devel
(cd $RPM_BUILD_ROOT; find .%{_includedir}/wx-%{wx_version}/wx -type d -mindepth 1 -maxdepth 1) | grep -v /wxPython | sed 's/^\.//' >> FILELIST.devel
(cd $RPM_BUILD_ROOT; find .%{_bindir} -type f -mindepth 1 -maxdepth 1) | grep -v -e '\(-config\|wxrc\)' | sed 's/^\.//' > FILELIST.python
+%find_lang wxstd
+%find_lang wxmsw
+cat wxstd.lang wxmsw.lang >> FILELIST.unicode
%post
-%run_ldconfig
+/sbin/ldconfig
+
+%post gl
+/sbin/ldconfig
+
+%post compat
+/sbin/ldconfig
%postun
-%run_ldconfig
+/sbin/ldconfig
+
+%postun gl
+/sbin/ldconfig
+
+%postun compat
+/sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
-%files -f FILELIST.normal
+%files -f FILELIST.unicode
%defattr (644, root, root, 755)
%doc docs/*.txt
%doc docs/base docs/gtk docs/publicity
-%doc README.1st.txt
-%{_datadir}/locale/*/*/*
+%doc README.1st.txt README.unicode
%dir %{_libdir}/wx
+%files compat -f FILELIST.ansi
+%defattr(755, root, root)
+
%files devel -f FILELIST.devel
%defattr (755, root, root, 755)
%{_bindir}/wxrc
@@ -237,6 +321,9 @@
%{py_sitedir}/*
%changelog
+* Wed Aug 29 2007 - prusnak@suse.cz
+- pack non-unicode libraries as wxGTK-compat package (again)
+- run ldconfig in post/postun scriptlets
* Wed May 23 2007 - prusnak@suse.cz
- update to 2.8.4.0
* changes are too numerous to list, see changes.txt for full list
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org