diff --git a/re2-symbols-fix.patch b/re2-symbols-fix.patch new file mode 100644 index 0000000..9e46535 --- /dev/null +++ b/re2-symbols-fix.patch @@ -0,0 +1,12 @@ +diff -up re2/libre2.symbols.fix re2/libre2.symbols +--- re2/libre2.symbols.fix 2013-11-12 10:54:28.312119611 -0500 ++++ re2/libre2.symbols 2013-11-12 10:54:43.057091010 -0500 +@@ -10,7 +10,7 @@ + _ZlsRSoRKN3re211StringPieceE; + # re2::FilteredRE2* + _ZN3re211FilteredRE2*; +- _ZNK3re211FilteredRE2*; ++ _ZNK3re211FilteredRE210AllMatches*; + local: + *; + }; diff --git a/re2.spec b/re2.spec index 6a99621..1652ad5 100644 --- a/re2.spec +++ b/re2.spec @@ -1,14 +1,12 @@ Name: re2 -Version: 20130115 -Release: 3%{?dist} - +Version: 20131024 +Release: 1%{?dist} Summary: C++ fast alternative to backtracking RE engines - Group: System Environment/Libraries License: BSD URL: http://code.google.com/p/%{name}/ Source0: http://re2.googlecode.com/files/%{name}-%{version}.tgz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Patch0: re2-symbols-fix.patch %description RE2 is a C++ library providing a fast, safe, thread-friendly alternative to @@ -36,28 +34,25 @@ you will need to install %{name}-devel. %prep %setup -q -n %{name} +%patch0 -p1 -b .fix %build # The -pthread flag issue has been submitted upstream: # http://groups.google.com/forum/?fromgroups=#!topic/re2-dev/bkUDtO5l6Lo # The RPM macro for the linker flags does not exist on EPEL %{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro} -CXXFLAGS="${CXXFLAGS:-%optflags}" +CXXFLAGS="${CXXFLAGS:-%optflags} -pthread" LDFLAGS="${LDFLAGS:-%__global_ldflags} -pthread" make %{?_smp_mflags} CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" includedir=%{_includedir} libdir=%{_libdir} %install -rm -rf $RPM_BUILD_ROOT make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir} libdir=%{_libdir} # Suppress the static library find $RPM_BUILD_ROOT -name 'lib%{name}.a' -exec rm -f {} \; %check -make %{?_smp_mflags} test - -%clean -rm -rf $RPM_BUILD_ROOT +make %{?_smp_mflags} shared-test %post -p /sbin/ldconfig @@ -71,8 +66,11 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name} %{_libdir}/lib%{name}.so - %changelog +* Mon Nov 11 2013 Tom Callaway - 20131024-1 +- update to 20131024 +- fix symbols export to stop test from failing + * Sun Aug 04 2013 Fedora Release Engineering - 20130115-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 92f3288..ef52739 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ef66646926e6cb8f11f277b286eac579 re2-20130115.tgz +9f02993572e6bb602c7257bacbae539a re2-20131024.tgz