Browse Source

updated 6 packages

colm-0.14.7-1

hyperscan-5.4.0-1

kelbt-0.16-12

pcre-8.45-1

pcre2-10.37-1

ragel-7.0.4-1
Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
32cb511db1
6 changed files with 97 additions and 64 deletions
  1. 28 9
      c/colm/colm-vl.spec
  2. 12 5
      h/hyperscan/hyperscan-vl.spec
  3. 7 1
      k/kelbt/kelbt-vl.spec
  4. 22 22
      p/pcre/pcre-vl.spec
  5. 5 8
      p/pcre2/pcre2-vl.spec
  6. 23 19
      r/ragel/ragel-vl.spec

+ 28 - 9
c/colm/colm-vl.spec

@@ -1,6 +1,6 @@
 Name:           colm
-Version:        0.13.0.7
-Release:        4%{?_dist_release}
+Version:        0.14.7
+Release:        1%{?_dist_release}
 Summary:        Programming language designed for the analysis of computer languages
 Group:          programming
 Vendor:         Project Vine
@@ -32,11 +32,16 @@ in the family of program transformation languages.
 Summary:        Development libraries and header files for %{name}
 Group:          programming
 Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes:      ragel-devel < 7.0.4
+Provides:       ragel-devel = 7.0.4
 
 %description devel
 %{summary}.
 
 
+%debug_package
+
+
 %prep
 %autosetup
 # Do not pollute with docs
@@ -45,32 +50,46 @@ sed -i -e "/dist_doc_DATA/d" Makefile.am
 
 %build
 autoreconf -vfi
-%configure --disable-static
+%configure --datadir=%{_datadir}/%{name}
 %make_build
 
 
 %install
 %make_install
 find %{buildroot}%{_libdir} -type f -name '*.la' -print -delete
+find %{buildroot}%{_libdir} -type f -name '*.a' -print -delete
 install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{name}.vim
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+rm -rf rpmdoc
+mkdir -p rpmdoc
+mv -f %{buildroot}%{_docdir}/%{name}/* ./rpmdoc/
 
 
 %files
 %license COPYING
-%doc ChangeLog README
-%{_bindir}/%{name}
+%doc CREDITS README
 %{_libdir}/lib%{name}-%{version}.so
-%exclude %{_datadir}/vim/vimfiles/syntax/%{name}.vim
+%{_libdir}/libfsm-%{version}.so
+%dir %{_datadir}/%{name}
 
 %files devel
+%doc rpmdoc/*
+%{_bindir}/%{name}
+%{_bindir}/%{name}-wrap
 %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}/
+%{_libdir}/libfsm.so
+%{_includedir}/aapl
+%{_includedir}/libfsm
+%{_includedir}/%{name}
+%{_datadir}/%{name}/*
+%exclude %{_datadir}/vim/vimfiles/syntax/%{name}.vim
 
 
 %changelog
+* Mon Jul 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.14.7-1
+- new upstream release.
+- dropped ldconfig scriptletes.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.13.0.7-4
 - rebuilt with current environment.
 

+ 12 - 5
h/hyperscan/hyperscan-vl.spec

@@ -1,5 +1,5 @@
 Name:           hyperscan
-Version:        5.3.0
+Version:        5.4.0
 Release:        1%{?_dist_release}
 Summary:        High-performance regular expression matching library
 Group:          system
@@ -9,6 +9,7 @@ Distribution:   Vine Linux
 License:        BSD
 URL:            https://www.hyperscan.io/
 Source0:        https://github.com/intel/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         hyperscan-5.4.0-fix-compilation-error.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  libboost-devel
@@ -60,13 +61,15 @@ needed for developing Hyperscan applications.
 
 
 %prep
-%autosetup
+%autosetup -p1
 
 
 %build
+export CXXFLAGS="%{optflags} -DBOOST_ALLOW_DEPRECATED_HEADERS"
+
 #cmake -DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_AND_SHARED:BOOL=OFF .
 # workaround for https://github.com/intel/hyperscan/issues/186
-%__cmake \
+%cmake \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DCMAKE_INSTALL_PREFIX:PATH=/usr \
@@ -76,11 +79,11 @@ needed for developing Hyperscan applications.
 	-DBUILD_STATIC_AND_SHARED=ON \
 	.
 
-%make_build
+%cmake_build
 
 
 %install
-%make_install
+%cmake_install
 
 rm -f %{buildroot}%{_libdir}/*.a
 
@@ -100,6 +103,10 @@ rm -f %{buildroot}%{_libdir}/*.a
 
 
 %changelog
+* Mon Jul 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.0-1
+- new upstream release.
+- imported Patch0 from upstream.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.3.0-1
 - new upstream release.
 

+ 7 - 1
k/kelbt/kelbt-vl.spec

@@ -1,7 +1,7 @@
 Summary:        Backtracking LR Parsing
 Name:           kelbt
 Version:        0.16
-Release:        11%{?_dist_release}
+Release:        12%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -27,6 +27,9 @@ backtracking at runtime. Kelbt is able to generate a parser for any
 context-free grammar that is free of hidden left recursion.
 
 
+%debug_package
+
+
 %prep
 %autosetup -p1
 
@@ -48,6 +51,9 @@ autoreconf -vfi
 
 
 %changelog
+* Mon Jul 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.16-12
+- rebuilt with current environment.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.16-11
 - rebuilt with current environment.
 

+ 22 - 22
p/pcre/pcre-vl.spec

@@ -1,15 +1,17 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Name: pcre
-Version: 8.44
-Release: 1%{?_dist_release}
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
+Name: pcre
+Version: 8.45
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: inagaki
 
-Group: System Environment/Libraries
 License: BSD
-URL: http://www.pcre.org/
-
+URL: https://www.pcre.org/
 Source0: https://ftp.pcre.org/pub/pcre/%{name}-%{version}.tar.bz2
 # Upstream thinks RPATH is good idea.
 Patch0: pcre-8.21-multilib.patch
@@ -31,11 +33,6 @@ BuildRequires: libedit-devel
 # New libtool to get rid of rpath
 BuildRequires: autoconf, automake, libtool
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
-Packager: inagaki
-
 %description
 Perl-compatible regular expression library.
 PCRE has its own native API, but a set of "wrapper" functions that are based on
@@ -44,10 +41,11 @@ just provides a POSIX calling interface to PCRE: the regular expressions
 themselves still follow Perl syntax and semantics. The header file
 for the POSIX-style functions is called pcreposix.h.
 
+
 %package devel
 Summary: Development files for %{name}
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 
 %description devel
@@ -57,7 +55,7 @@ Development files (Headers, libraries for static linking, etc) for %{name}.
 %package -n compat32-%{name}
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 
 %description -n compat32-%{name}
 Perl-compatible regular expression library.
@@ -71,13 +69,16 @@ for the POSIX-style functions is called pcreposix.h.
 %package -n compat32-%{name}-devel
 Summary: Development files for %{name}
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 Development files (Headers, libraries for static linking, etc) for %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 # Get rid of rpath
@@ -94,6 +95,7 @@ for F in ChangeLog; do
     mv "${F}.utf8" "$F"
 done
 
+
 %build
 %configure \
     --enable-jit \
@@ -116,6 +118,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+
 %check
 %ifarch s390 s390x ppc
 # larger stack is needed on s390, ppc
@@ -123,17 +126,10 @@ ulimit -s 10240
 %endif
 make %{?_smp_mflags} check VERBOSE=yes
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
 
 %files
 %defattr(-,root,root)
@@ -167,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.45-1
+- new upstream release.
+- dropped ldconfig scriptletes.
+
 * Sun Mar 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.44-1
 - new upstream release.
 

+ 5 - 8
p/pcre2/pcre2-vl.spec

@@ -3,7 +3,7 @@
 Summary: Perl-compatible regular expression library
 Summary(ja): Perl 互換の正規表現ライブラリ
 Name: pcre2
-Version: 10.36
+Version: 10.37
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -119,13 +119,6 @@ make %{?_smp_mflags} check VERBOSE=yes
 rm -rf $RPM_BUILD_ROOT 
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-
 %files
 %defattr(-,root,root)
 %license COPYING LICENCE
@@ -158,6 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.37-1
+- new upstream release.
+- dropped ldconfig scriptletes.
+
 * Mon Feb 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.36-1
 - new upstream release.
 

+ 23 - 19
r/ragel/ragel-vl.spec

@@ -2,8 +2,8 @@
 
 Summary:        Finite state machine compiler
 Name:           ragel
-Version:        7.0.0.12
-Release:        5%{?_dist_release}
+Version:        7.0.4
+Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -21,9 +21,8 @@ BuildRequires:  libtool
 BuildRequires:  make
 %if ! %{with bootstrap}
 BuildRequires:  kelbt
-BuildRequires:  ragel
 %endif
-BuildRequires:  colm-devel = 0.13.0.7
+BuildRequires:  colm-devel = 0.14.7
 
 # Unfortunately, upstream doesn't exist and not possible to find version
 Provides:       bundled(aapl)
@@ -44,6 +43,9 @@ Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %{summary}.
 
 
+%debug_package
+
+
 %prep
 %autosetup
 # Do not pollute with docs
@@ -53,44 +55,46 @@ sed -i -e "/dist_doc_DATA/d" Makefile.am
 %build
 autoreconf -vfi
 %configure \
+	--datadir=%{_datadir}/colm \
 	--disable-static \
+	--with-colm=/usr \
+	--disable-manual \
 %if ! %{with bootstrap}
-	--with-ragel \
 	--with-kelbt \
 %endif
 	%{nil}
 
-%make_build
+%make_build \
+	LIBCOLM_LA='-lcolm' LIBFSM_LA='-lfsm' COLM_SHARE='%{_datadir}/colm'
 
 
 %install
-%make_install
+%make_install \
+	LIBCOLM_LA='-lcolm' LIBFSM_LA='-lfsm' COLM_SHARE='%{_datadir}/colm'
+
 find %{buildroot}%{_libdir} -type f -name '*.la' -print -delete
 install -p -m 0644 -D %{name}.vim %{buildroot}%{_datadir}/vim/vimfiles/syntax/%{name}.vim
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files
 %license COPYING
-%doc CREDITS ChangeLog
+%doc README
 %{_bindir}/%{name}
 %{_bindir}/%{name}-*
 %{_mandir}/man1/%{name}.1*
-%{_libdir}/libfsm.so.*
 %{_libdir}/libragel.so.*
-%{_datarootdir}/%{name}.lm
+%exclude %{_libdir}/libragel.so
+%dir %{_datadir}/colm
+%{_datadir}/colm/*.lm
 %exclude %{_datadir}/vim/vimfiles/syntax/%{name}.vim
 
-%files devel
-%{_libdir}/libfsm.so
-%{_libdir}/libragel.so
-%{_includedir}/%{name}/
-
 
 %changelog
+* Mon Jul 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.0.4-1
+- new upstream release.
+- dropped ldconfig scriptletes.
+- ragel-devel has gone.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 7.0.0.12-5
 - rebuilt with current environment.