rpms/wxGTK/EL-6 wx-config,NONE,1.1 wxGTK.spec,1.52,1.53
Dan Horák
sharkcz at fedoraproject.org
Fri Jul 9 11:09:36 UTC 2010
- Previous message: rpms/wxGTK/devel .cvsignore, 1.12, 1.13 wxGTK.spec, 1.56, 1.57 wxGTK-2.8.10-CVE-2009-2369.patch, 1.1, NONE wxGTK-2.8.10-gsocket.patch, 1.1, NONE wxGTK-2.8.10-htmltable.patch, 1.1, NONE wxGTK-2.8.10-menubar-height.patch, 1.1, NONE wxGTK-2.8.10-wxTimer-fix.patch, 1.1, NONE
- Next message: rpms/corosync/devel corosync.spec,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/pkgs/rpms/wxGTK/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30974
Modified Files:
wxGTK.spec
Added Files:
wx-config
Log Message:
* Thu Jul 1 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-2
- rebuilt without the internal crash handler
--- NEW FILE wx-config ---
#! /bin/sh
#
# Multilib-aware wrapper for the wx-config script
#
# Usage: wx-config [--arch <arch>] <regular wx-config options>
#
if [ $# -ge 2 ]; then
if [ $1 = "--arch" ]; then
arch=$2
shift 2
fi
fi
if [ -z $arch ]; then
arch=`uname -m`
fi
case $arch in
i?86|ppc|s390|sparc|arm*|ia64)
libdir=/usr/lib
;;
x86_64|ppc64|s390x|sparc64)
libdir=/usr/lib64
;;
*)
echo "Unsupported architecture '$arch'"
exit 8
;;
esac
wxconfig=$libdir/wx/config/gtk2-unicode-release-2.8
# special case when using 32-bit userspace and 64-bit kernel
if [ ! -f $wxconfig -a \( $arch = ppc64 -o $arch = sparc64 \) ]; then
wxconfig=/usr/lib/wx/config/gtk2-unicode-release-2.8
fi
if [ -x $wxconfig ]; then
exec $wxconfig $@
else
echo "wxGTK-devel isn't installed for architecture '$arch'"
exit 9
fi
Index: wxGTK.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxGTK/EL-6/wxGTK.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- wxGTK.spec 26 Apr 2010 09:52:33 -0000 1.52
+++ wxGTK.spec 9 Jul 2010 11:09:36 -0000 1.53
@@ -1,11 +1,12 @@
Name: wxGTK
Version: 2.8.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GTK2 port of the wxWidgets GUI library
License: wxWidgets
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
-Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/wxwindows/%{name}-%{version}.tar.bz2
+Source1: wx-config
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,6 +18,7 @@ BuildRequires: libSM-devel
BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
BuildRequires: GConf2-devel
BuildRequires: autoconf, gettext
+BuildRequires: cppunit-devel
Requires: wxBase = %{version}-%{release}
@@ -86,10 +88,6 @@ chmod a-x src/common/msgout.cpp
%build
-# must do this to regenerate ./configure if patching to a cvs
-# version.
-#autoconf
-
export GDK_USE_XFT=1
# this code dereferences type-punned pointers like there's no tomorrow.
@@ -116,7 +114,8 @@ CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-ali
--enable-mediactrl \
--enable-display \
--enable-timer \
- --enable-compat24
+ --enable-compat24 \
+ --disable-catch_segvs
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
@@ -138,10 +137,9 @@ rm -rf $RPM_BUILD_ROOT
%makeinstall -C contrib/src/svg
-# this ends up being a symlink into the buildroot directly --
-# not what we want!
+# install our multilib-aware wrapper
rm $RPM_BUILD_ROOT%{_bindir}/wx-config
-ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.8 $RPM_BUILD_ROOT%{_bindir}/wx-config
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/wx-config
# we don't support bakefiles
rm -rf $RPM_BUILD_ROOT%{_datadir}/bakefile
@@ -153,6 +151,11 @@ cat wxmsw.lang >> wxstd.lang
%clean
rm -rf $RPM_BUILD_ROOT
+%check
+pushd tests
+make test
+popd
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -215,8 +218,17 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Apr 26 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
-- update to 2.8.11
+* Thu Jul 1 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-2
+- rebuilt without the internal crash handler
+
+* Thu Apr 15 2010 Dan Horák <dan[at]danny.cz> - 2.8.11-1
+- updated to 2.8.11
+
+* Wed Nov 25 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-9
+- updated the wrapper script (#541087)
+
+* Fri Nov 20 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-8
+- added multilib-aware wrapper for wx-config
* Tue Nov 10 2009 Dan Horák <dan[at]danny.cz> - 2.8.10-7
- added fix for html tables rendering (#534030)
- Previous message: rpms/wxGTK/devel .cvsignore, 1.12, 1.13 wxGTK.spec, 1.56, 1.57 wxGTK-2.8.10-CVE-2009-2369.patch, 1.1, NONE wxGTK-2.8.10-gsocket.patch, 1.1, NONE wxGTK-2.8.10-htmltable.patch, 1.1, NONE wxGTK-2.8.10-menubar-height.patch, 1.1, NONE wxGTK-2.8.10-wxTimer-fix.patch, 1.1, NONE
- Next message: rpms/corosync/devel corosync.spec,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list