From d9dd2deb3a269e9673b6816d3f3d58e5843c5912 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 01 2017 03:38:06 +0000 Subject: import liblognorm-2.0.2-1.el7 --- diff --git a/.gitignore b/.gitignore index acf8351..77f58a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/liblognorm-0.3.7.tar.gz +SOURCES/liblognorm-2.0.2.tar.gz diff --git a/.liblognorm.metadata b/.liblognorm.metadata index 63e809b..a2653f9 100644 --- a/.liblognorm.metadata +++ b/.liblognorm.metadata @@ -1 +1 @@ -b1e183fa62a22d4c7edf40c8a6373e0b38ef840d SOURCES/liblognorm-0.3.7.tar.gz +dca441d5384fbba6214c2439fb69d5b99afb82f5 SOURCES/liblognorm-2.0.2.tar.gz diff --git a/SPECS/liblognorm.spec b/SPECS/liblognorm.spec index 3421147..a6d6c34 100644 --- a/SPECS/liblognorm.spec +++ b/SPECS/liblognorm.spec @@ -1,6 +1,8 @@ +%define htmldir %{_docdir}/liblognorm/html + Name: liblognorm -Version: 0.3.7 -Release: 3%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: Fast samples-based log normalization library License: LGPLv2+ @@ -8,7 +10,10 @@ URL: http://www.liblognorm.com Source0: http://www.liblognorm.com/files/download/%{name}-%{version}.tar.gz Patch1: liblognorm-0.3.4-pc-file.patch -BuildRequires: libestr-devel, libee-devel, chrpath +BuildRequires: chrpath +BuildRequires: libfastjson-devel +BuildRequires: libestr-devel +BuildRequires: pcre-devel %description Briefly described, liblognorm is a tool to normalize log data. @@ -24,12 +29,21 @@ the logs you want to normalize. %package devel Summary: Development tools for programs using liblognorm library Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libee-devel%{?_isa} libestr-devel%{?_isa} +Requires: libfastjson-devel%{?_isa} +Requires: libestr-devel%{?_isa} %description devel The liblognorm-devel package includes header files, libraries necessary for developing programs which use liblognorm library. +%package doc +Summary: HTML documentation for liblognorm +Group: Documentation +BuildRequires: python-sphinx + +%description doc +This sub-package contains documentation for liblognorm in a HTML form. + %package utils Summary: Lognormalizer utility for normalizing log files Requires: %{name}%{?_isa} = %{version}-%{release} @@ -40,24 +54,28 @@ log files. %prep %setup -q -%patch1 -p1 -b .pc-file.patch %build -%configure -V=1 make +%configure --enable-regexp --enable-docs --docdir=%{htmldir} + %install -make install INSTALL="install -p" DESTDIR=%{buildroot} +make V=1 install INSTALL="install -p" DESTDIR=%{buildroot} rm -f %{buildroot}/%{_libdir}/*.{a,la} -chrpath -d %{buildroot}/%{_bindir}/lognormalizer -chrpath -d %{buildroot}/%{_libdir}/liblognorm.so.0.0.0 +chrpath -d %{buildroot}%{_bindir}/lognormalizer +chrpath -d %{buildroot}%{_libdir}/liblognorm.so +rm %{buildroot}%{htmldir}/{objects.inv,.buildinfo} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%doc AUTHORS ChangeLog COPYING NEWS README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS ChangeLog README +%exclude %{htmldir} + %{_libdir}/lib*.so.* %files devel @@ -65,11 +83,19 @@ chrpath -d %{buildroot}/%{_libdir}/liblognorm.so.0.0.0 %{_includedir}/*.h %{_libdir}/pkgconfig/*.pc +%files doc +%doc %{htmldir} + %files utils %{_bindir}/lognormalizer + %changelog +* Wed Mar 1 2017 Radovan Sroka 2.0.2-1 +- rebase to 2.0.2 +- resolves: rhbz#1420719 + * Fri Jan 24 2014 Daniel Mach - 0.3.7-3 - Mass rebuild 2014-01-24