Remove cppunit workaround (no longer needed)

epel8
Scott Talbert 6 years ago
parent 852c9171ac
commit 299b0b6e24

@ -253,9 +253,6 @@ sed -i -e 's|wxmsw.mo|wxmsw3.mo|' Makefile.in
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp sed -i -e 's|/lib|/%{_lib}|' src/unix/stdpaths.cpp
# Trick configure into using pkg-config for cppunit-config
sed -i -e 's|$CPPUNIT_CONFIG --version|$CPPUNIT_CONFIG --modversion|' configure
%build %build
# likely still dereferences type-punned pointers # likely still dereferences type-punned pointers
@ -263,8 +260,6 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
# fix unused-direct-shlib-dependency error: # fix unused-direct-shlib-dependency error:
export LDFLAGS="-Wl,--as-needed" export LDFLAGS="-Wl,--as-needed"
# Trick configure into using pkg-config for cppunit-config
export CPPUNIT_CONFIG="/usr/bin/pkg-config cppunit"
%if 0%{?usesnapshot} %if 0%{?usesnapshot}
#For snapshots, mo files need to be generated #For snapshots, mo files need to be generated
@ -462,6 +457,7 @@ fi
* Wed Nov 21 2018 Scott Talbert <swt@techie.net> - 3.0.4-5 * Wed Nov 21 2018 Scott Talbert <swt@techie.net> - 3.0.4-5
- Remove Group tags - Remove Group tags
- Remove xmldocs subpackage (never used) - Remove xmldocs subpackage (never used)
- Remove cppunit workaround (no longer needed)
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-4 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Loading…
Cancel
Save