diff --git a/.gitignore b/.gitignore index df004de..c6f2168 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ragel-6.9.tar.gz /ragel-7.0.0.9.tar.gz /ragel-7.0.0.10.tar.gz +/ragel-7.0.0.11.tar.gz diff --git a/ragel-6.6-gcc47-lookup.patch b/ragel-6.6-gcc47-lookup.patch deleted file mode 100644 index 0609995..0000000 --- a/ragel-6.6-gcc47-lookup.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- ragel-6.6/aapl/avlcommon.h.gcc47 2008-10-08 04:36:00.000000000 +0900 -+++ ragel-6.6/aapl/avlcommon.h 2012-07-27 13:38:25.316949293 +0900 -@@ -881,9 +881,9 @@ template Element *AvlTr - } - - #ifdef AVL_BASIC -- keyRelation = compare( *element, *curEl ); -+ keyRelation = this->compare( *element, *curEl ); - #else -- keyRelation = compare( element->BASEKEY(getKey()), -+ keyRelation = this->compare( element->BASEKEY(getKey()), - curEl->BASEKEY(getKey()) ); - #endif - -@@ -920,7 +920,7 @@ template Element *AvlTr - long keyRelation; - - while (curEl) { -- keyRelation = compare( *element, *curEl ); -+ keyRelation = this->compare( *element, *curEl ); - - /* Do we go left? */ - if ( keyRelation < 0 ) -@@ -969,7 +969,7 @@ template Element *AvlTr - return element; - } - -- keyRelation = compare( key, curEl->BASEKEY(getKey()) ); -+ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) ); - - /* Do we go left? */ - if ( keyRelation < 0 ) { -@@ -1023,7 +1023,7 @@ template Element *AvlTr - return element; - } - -- keyRelation = compare(key, curEl->getKey()); -+ keyRelation = this->compare(key, curEl->getKey()); - - /* Do we go left? */ - if ( keyRelation < 0 ) { -@@ -1058,7 +1058,7 @@ template Element *AvlTr - long keyRelation; - - while (curEl) { -- keyRelation = compare( key, curEl->BASEKEY(getKey()) ); -+ keyRelation = this->compare( key, curEl->BASEKEY(getKey()) ); - - /* Do we go left? */ - if ( keyRelation < 0 ) ---- ragel-6.6/aapl/bstcommon.h.gcc47 2008-10-08 04:36:00.000000000 +0900 -+++ ragel-6.6/aapl/bstcommon.h 2012-07-27 13:38:25.317949416 +0900 -@@ -361,7 +361,7 @@ template bool BstTable>1); -- keyRelation = compare(key, GET_KEY(*mid)); -+ keyRelation = this->compare(key, GET_KEY(*mid)); - - if ( keyRelation < 0 ) - upper = mid - 1; -@@ -373,12 +373,12 @@ template bool BstTablecompare(key, GET_KEY(*lower)) == 0 ) - lower--; - - upper = mid + 1; - while ( upper != highEnd && -- compare(key, GET_KEY(*upper)) == 0 ) -+ this->compare(key, GET_KEY(*upper)) == 0 ) - upper++; - - low = (Element*)lower + 1; -@@ -419,7 +419,7 @@ template Element *BstTab - } - - mid = lower + ((upper-lower)>>1); -- keyRelation = compare(key, GET_KEY(*mid)); -+ keyRelation = this->compare(key, GET_KEY(*mid)); - - if ( keyRelation < 0 ) - upper = mid - 1; -@@ -457,7 +457,7 @@ template Element *BstTab - } - - mid = lower + ((upper-lower)>>1); -- keyRelation = compare(key, GET_KEY(*mid)); -+ keyRelation = this->compare(key, GET_KEY(*mid)); - - if ( keyRelation < 0 ) - upper = mid - 1; -@@ -508,7 +508,7 @@ template Element *BstTab - } - - mid = lower + ((upper-lower)>>1); -- keyRelation = compare(key, GET_KEY(*mid)); -+ keyRelation = this->compare(key, GET_KEY(*mid)); - - if ( keyRelation < 0 ) - upper = mid - 1; -@@ -603,7 +603,7 @@ template Element *BstTab - } - - mid = lower + ((upper-lower)>>1); -- keyRelation = compare(GET_KEY(el), GET_KEY(*mid)); -+ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid)); - - if ( keyRelation < 0 ) - upper = mid - 1; -@@ -662,7 +662,7 @@ template Element *BstTab - } - - mid = lower + ((upper-lower)>>1); -- keyRelation = compare(GET_KEY(el), GET_KEY(*mid)); -+ keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid)); - - if ( keyRelation < 0 ) - upper = mid - 1; ---- ragel-6.6/aapl/bubblesort.h.gcc47 2008-10-08 04:36:00.000000000 +0900 -+++ ragel-6.6/aapl/bubblesort.h 2012-07-27 13:38:25.322950031 +0900 -@@ -72,7 +72,7 @@ template void B - changed = false; - for ( long i = 0; i < len-pass; i++ ) { - /* Do we swap pos with the next one? */ -- if ( compare( data[i], data[i+1] ) > 0 ) { -+ if ( this->compare( data[i], data[i+1] ) > 0 ) { - char tmp[sizeof(T)]; - - /* Swap the two items. */ ---- ragel-6.6/aapl/mergesort.h.gcc47 2008-10-08 04:36:00.000000000 +0900 -+++ ragel-6.6/aapl/mergesort.h 2012-07-27 13:39:50.772464997 +0900 -@@ -110,7 +110,7 @@ template< class T, class Compare> void M - } - else { - /* Both upper and lower left. */ -- if ( compare(*lower, *upper) <= 0 ) -+ if ( this->compare(*lower, *upper) <= 0 ) - memcpy( dest++, lower++, sizeof(T) ); - else - memcpy( dest++, upper++, sizeof(T) ); diff --git a/ragel.spec b/ragel.spec index 6a5a824..ff9517f 100644 --- a/ragel.spec +++ b/ragel.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap -Name: ragel -Version: 7.0.0.10 -Release: 2%{?dist} +Name: ragel +Version: 7.0.0.11 +Release: 1%{?dist} Summary: Finite state machine compiler # aapl/ is the LGPLv2+ @@ -43,8 +43,6 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %autosetup # Do not pollute with docs sed -i -e "/dist_doc_DATA/d" Makefile.am -# Put headers under subdir -sed -i -e "s/include_HEADERS/pkginclude_HEADERS/g" src/Makefile.am aapl/Makefile.am %build autoreconf -vfi @@ -62,10 +60,12 @@ install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{ %files %license COPYING %doc CREDITS ChangeLog -#doc doc/ragel-guide.pdf %{_bindir}/%{name} +%{_bindir}/%{name}-* %{_mandir}/man1/%{name}.1* %{_libdir}/libfsm.so.* +%{_libdir}/libragel.so.* +%{_datarootdir}/%{name}.lm %dir %{_datadir}/vim %dir %{_datadir}/vim/vimfiles %dir %{_datadir}/vim/vimfiles/syntax @@ -73,9 +73,13 @@ install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{ %files devel %{_libdir}/libfsm.so +%{_libdir}/libragel.so %{_includedir}/%{name}/ %changelog +* Fri Jul 06 2018 Christian Glombek - 7.0.0.11-1 +- Update to 7.0.0.11 + * Fri Feb 09 2018 Fedora Release Engineering - 7.0.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -142,7 +146,7 @@ install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{ - remove patch, fix applied upstream * Sun Aug 02 2009 Jeremy Hinegardner - 6.5-2 -- fix build process +- fix build process * Sun Aug 02 2009 Jeremy Hinegardner - 6.5-1 - Update to 6.5 diff --git a/sources b/sources index 4da1be5..bfb04fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ragel-7.0.0.10.tar.gz) = 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba +SHA512 (ragel-7.0.0.11.tar.gz) = f46308149b60a7cb8ca4108f7dd4807796ebc40c0d32c2ee61407b5b9692aa2f7fab52e02c1b21538fd0829a05ab0ebdbb1b08afe9fdc39cb487ee0e3419222c