Merge branch 'master' of github.com:patrickfrey/strusPattern

patrickfrey · Dec 29, 2017 · 7e6b3bd · 7e6b3bd
2 parents e0f8ee3 + 8ebdce9
commit 7e6b3bd
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/dist/archlinux/PKGBUILD.in b/dist/archlinux/PKGBUILD.in
@@ -10,8 +10,8 @@ pkgdesc='Library implementing pattern matching on text for document and query an
 license=('MPL2')
 arch=('i686' 'x86_64')
 url="http://project-strus.net"
-depends=('boost>=1.53' 'boost-libs>=1.53' "strusbase>=${_deppkgver}" "strus>=${_deppkgver}" "strusanalyzer>=${_deppkgver}" "strustrace>=${_deppkgver}" "strusmodule>=${_deppkgver}")
-makedepends=('cmake' 'ragel')
+depends=('boost>=1.53' 'boost-libs>=1.53' 'tre' "strusbase>=${_deppkgver}" "strus>=${_deppkgver}" "strusanalyzer>=${_deppkgver}" "strustrace>=${_deppkgver}" "strusmodule>=${_deppkgver}")
+makedepends=('cmake' 'ragel' 'python')
 source=("${pkgname}-${_mainpkgver}.tar.gz")
 
 build() {

diff --git a/dist/obs/struspattern.dsc.in b/dist/obs/struspattern.dsc.in
@@ -4,7 +4,7 @@ Version: @STRUS_VERSION@
 Binary: struspattern
 Maintainer: Patrick Frey <[email protected]>
 Architecture: any
-Build-Depends: debhelper (>= 4.1.16), cmake, ragel,
+Build-Depends: debhelper (>= 4.1.16), cmake, ragel, libtre-dev, python,
  libboost-dev, libboost-thread-dev, libboost-system-dev,
  libboost-date-time-dev, libboost-regex-dev, strusbase-dev,
  strus-dev, strusanalyzer-dev, strustrace-dev, strusmodule-dev

diff --git a/dist/redhat/struspattern.spec.in b/dist/redhat/struspattern.spec.in
@@ -122,7 +122,6 @@ BuildRoot: %{_tmppath}/%{name}-root
 BuildRequires: gcc
 BuildRequires: gcc-c++
 BuildRequires: cmake
-BuildRequires: ragel
 
 # LinuxDistribution.cmake depends depends on the Linux release files in '/etc' or
 # LSB files
@@ -195,6 +194,32 @@ BuildRequires: boost-devel
 %endif
 %endif
 
+BuildRequires: python
+
+%if %{rhel} || %{centos} || %{scilin} || %{fedora}
+%if %{rhel} || %{centos} || %{scilin}
+BuildRequires: strusragel
+%endif
+%if %{fedora}
+%if %{fc24} || %{fc25} || %{fc26} || %{fc27} || %{frawhide}
+BuildRequires: ragel
+%endif
+%endif
+%endif
+
+%if %{rhel} || %{centos} || %{scilin} || %{fedora}
+%if %{rhel} || %{centos} || %{scilin}
+BuildRequires: strustre-devel
+Requires: strustre
+%endif
+%if %{fedora}
+%if %{fc24} || %{fc25} || %{fc26} || %{fc27} || %{frawhide}
+BuildRequires: tre-devel
+Requires: tre
+%endif
+%endif
+%endif
+
 BuildRequires: strusbase-devel >= %{dep_version}
 BuildRequires: strusbase >= %{dep_version}
 BuildRequires: strus-devel >= %{dep_version}
@@ -250,6 +275,12 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug
 rm -rf $RPM_BUILD_ROOT%{_prefix}/src/debug
 
+# remove things we don't need from hyperscan
+rm -rf $RPM_BUILD_ROOT%{_includedir}/hs
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libhs.pc
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libhs*.a
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/
+
 %clean
 rm -rf $RPM_BUILD_ROOT