Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ragel for openSUSE:Factory checked in at 2021-04-29 22:46:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ragel (Old) and /work/SRC/openSUSE:Factory/.ragel.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ragel" Thu Apr 29 22:46:50 2021 rev:13 rq:889329 version:7.0.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ragel/ragel.changes 2020-08-29 20:36:45.113323971 +0200 +++ /work/SRC/openSUSE:Factory/.ragel.new.1947/ragel.changes 2021-04-29 22:53:29.861865018 +0200 @@ -1,0 +2,10 @@ +Mon Apr 26 21:25:34 UTC 2021 - Jan Engelhardt <[email protected]> + +- Update to release 7.0.4 + * No changelog provided + * The ragel-devel package is gone. A number of header files seem + to have moved to colm-devel (but in new locations, so may + need update "#include" lines in your programs). +- Add paths.patch + +------------------------------------------------------------------- Old: ---- ragel-7.0.0.12.tar.gz New: ---- paths.patch ragel-7.0.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ragel.spec ++++++ --- /var/tmp/diff_new_pack.wCIfwN/_old 2021-04-29 22:53:30.333862843 +0200 +++ /var/tmp/diff_new_pack.wCIfwN/_new 2021-04-29 22:53:30.337862824 +0200 @@ -1,7 +1,7 @@ # # spec file for package ragel # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,23 @@ Name: ragel -Version: 7.0.0.12 +Version: 7.0.4 Release: 0 Summary: Finite state machine compiler License: MIT Group: Development/Tools/Other URL: https://www.colm.net/open-source/ragel/ -#Git-Clone: https://github.com/adriandt/ragel +#Git-Clone: https://github.com/adrian-thurston/ragel Source: https://www.colm.net/files/ragel/%name-%version.tar.gz Source2: %name.keyring +Patch1: paths.patch BuildRequires: automake -BuildRequires: colm = 0.13.0.7 +BuildRequires: colm-devel = 0.14.7 BuildRequires: gcc-c++ BuildRequires: kelbt BuildRequires: libtool +Obsoletes: libragel0 < %version-%release %description Ragel compiles finite state machines from regular languages into @@ -41,43 +43,15 @@ regular language. Code embedding is done using inline operators that do not disrupt the regular language syntax. -%package -n libfsm0 -Summary: Library implementing a finite state machine -Group: System/Libraries - -%description -n libfsm0 -libfsm is one of ragel's component libraries. -Ragel compiles finite state machines from regular languages into -executable C, C++, Objective-C, or D code. - -%package -n libragel0 -Summary: Ragel parser support library -Group: System/Libraries - -%description -n libragel0 -libragel contains the parse tree and other parsing support code - -everything except the reducers, which are specific to the frontends. - -%package devel -Summary: Development files for ragel, a finite state machine compiler library -Group: Development/Libraries/C and C++ -Requires: libfsm0 = %version-%release - -%description devel -Ragel compiles finite state machines from regular languages into -executable C, C++, Objective-C, or D code. -This package contains the C headers for libragel. - %prep %autosetup -p1 %build autoreconf -fiv export CXXFLAGS="%optflags -Wno-narrowing" -# Banish terribly namespaced files into a separate dir %configure --docdir="%_docdir/%name" --includedir="%_includedir/ragel" \ - --disable-static -make %{?_smp_mflags} V=1 + --datadir="%_datadir" --disable-static --disable-manual +%make_build %check make check @@ -88,12 +62,12 @@ c="$b/%_datadir/vim/site/syntax" mkdir -p "$c" install -pm0644 ragel*.vim "$c/" -rm -Rf "%buildroot/%_libdir"/*.la +rm -Rf "$b/%_libdir"/*.la +# no headers available +rm -f "$b/%_libdir/libragel.so" -%post -n libfsm0 -p /sbin/ldconfig -%postun -n libfsm0 -p /sbin/ldconfig -%post -n libragel0 -p /sbin/ldconfig -%postun -n libragel0 -p /sbin/ldconfig +mkdir -p "$b/%_datadir/colm" +mv "$b/%_datadir"/*.lm "$b/%_datadir/colm/" %files %license COPYING @@ -101,16 +75,7 @@ %_bindir/ragel* %_mandir/man1/ragel.1* %_datadir/vim/ -%_datadir/ragel* - -%files -n libfsm0 -%_libdir/libfsm.so.0* - -%files -n libragel0 +%_datadir/colm/ %_libdir/libragel.so.0* -%files devel -%_libdir/*.so -%_includedir/ragel/ - %changelog ++++++ paths.patch ++++++ From: Jan Engelhardt <[email protected]> Date: 2021-04-27 18:22:18.718396764 +0200 ragel just completely lacks a block to support system colm. --- configure.ac | 14 ++++++++------ src/Makefile.am | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) Index: ragel-7.0.4/configure.ac =================================================================== --- ragel-7.0.4.orig/configure.ac +++ ragel-7.0.4/configure.ac @@ -51,14 +51,16 @@ AC_ARG_WITH(colm, LIBFSM_LA="$withval/lib/libfsm.la" COLM_SHARE="$withval/share" ], - [] + [ + COLM=/usr/bin/colm + COLM_WRAP=/usr/bin/colm-wrap + CPPFLAGS="-I/usr/include/aapl $CPPFLAGS" + LIBCOLM_LA=-lcolm + LIBFSM_LA=-lfsm + COLM_SHARE='${datadir}/colm' + ] ) -AC_CHECK_FILES( - [$COLM], - [], - [AC_ERROR([colm is required to build ragel])] -) AC_SUBST(COLM) AC_SUBST(COLM_WRAP) AC_SUBST(COLM_SHARE) Index: ragel-7.0.4/src/Makefile.am =================================================================== --- ragel-7.0.4.orig/src/Makefile.am +++ ragel-7.0.4/src/Makefile.am @@ -39,7 +39,7 @@ nodist_ragel_SOURCES = \ parse.c rlreduce.cc ragel_LDADD = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la -ragel_DEPENDENCIES = $(LIBFSM_LA) $(LIBCOLM_LA) libragel.la +ragel_DEPENDENCIES = libragel.la BUILT_SOURCES = \ version.h \ ++++++ ragel-7.0.0.12.tar.gz -> ragel-7.0.4.tar.gz ++++++ ++++ 471603 lines of diff (skipped)
