From ee5b708351e0d57d330778b4b4ac81d0736e2c07 Mon Sep 17 00:00:00 2001 From: TI_Eugene Date: Oct 24 2014 07:51:55 +0000 Subject: Version bump --- diff --git a/0.2.0.tar.gz b/0.2.0.tar.gz new file mode 100644 index 0000000..92e1532 Binary files /dev/null and b/0.2.0.tar.gz differ diff --git a/libsysstat.spec b/libsysstat.spec index 9426577..5f24792 100644 --- a/libsysstat.spec +++ b/libsysstat.spec @@ -1,12 +1,20 @@ -Name: libsysstat -Version: 0.1.0 +%if 0%{?rhel} == 6 +%define cmake_pkg cmake28 +%else +%define cmake_pkg cmake +%endif + +Name: libsysstat +Version: 0.2.0 Release: 1%{?dist} License: GPLv2 and LGPLv2+ Summary: Library used to query system info and statistics Url: http://www.lxde.org Source: https://github.com/lxde/libsysstat/archive/%{version}.tar.gz -BuildRequires: cmake -BuildRequires: pkgconfig(QtCore) +Patch0: %{name}-libpath.patch +BuildRequires: %{cmake_pkg} >= 2.8.11 +BuildRequires: pkgconfig(Qt5Core) +BuildRequires: qt5-qttools-devel %description Library used to query system info and statistics @@ -21,11 +29,12 @@ sysstat libraries for development %prep %setup -q +%patch0 -p 0 %build mkdir build pushd build -%cmake .. +%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=ON .. make %{?_smp_mflags} popd @@ -40,16 +49,20 @@ popd %files %doc AUTHORS COPYING -%{_libdir}/%{name}.so.* +%{_libdir}/libsysstat-qt5.so.* %files devel -%dir %{_includedir}/sysstat -%dir %{_datadir}/cmake/sysstat/ -%{_includedir}/sysstat/* -%{_datadir}/cmake/sysstat/* -%{_libdir}/pkgconfig/sysstat.pc -%{_libdir}/%{name}.so +%dir %{_includedir}/sysstat-qt5/ +%dir %{_datadir}/cmake/sysstat-qt5/ +%{_includedir}/sysstat-qt5/* +%{_datadir}/cmake/sysstat-qt5/* +%{_libdir}/pkgconfig/sysstat-qt5.pc +%{_libdir}/libsysstat-qt5.so %changelog +* Fri Oct 24 2014 TI_Eugene - 0.2.0-1 +- Version bump +- qt5 only + * Fri Sep 26 2014 TI_Eugene - 0.1.0-1 - Initial packaging