Compare commits

..

No commits in common. "5aa4e3a5f0456e87c32cba44540d2681fbc8896d" and "03f1c7cca51a9a9d7351ef965eb60cc632f322dc" have entirely different histories.

2 changed files with 11 additions and 16 deletions

View file

@ -9,7 +9,7 @@ configuration_inc = include_directories('.')
#csv = cmake.subproject('csv-parser')
#csv_lib = csv.dependency('csv')
nlohmann_lib = dependency('nlohmann_json', version : '>=3.5.0', required : false)
nlohmann_lib = dependency('nlohmann_json', version : '>=3.55.0', required : false)
if not nlohmann_lib.found()
nlohmann_inc = include_directories('subprojects/nlohmann_json/single_include/nlohmann')
@ -30,6 +30,3 @@ if build_machine.system() == 'linux'
install_data('misc/kima2.desktop', install_dir : get_option('datadir') / 'applications')
install_data('manual/Benutzerhandbuch.pdf', install_dir : get_option('datadir') / 'kima2')
endif
rpm = import('rpm')
rpm.generate_spec_template()

View file

@ -1,20 +1,21 @@
Name: kima2
Version: 1.6.0
Version: # FIXME
Release: 1%{?dist}
Summary: A small cash point program for children's things markets
License: custom
Source0: %{name}-%{version}.tar.gz
Source0: %{name}-%{version}.tar.xz # FIXME
BuildRequires: meson
BuildRequires: gcc-c++
#BuildRequires: pkgconfig(nlohmann_json)
BuildRequires: boost-date-time
BuildRequires: sqlite-devel
BuildRequires: libusb-devel
BuildRequires: qt5-qtdeclarative-devel
#BuildRequires: pkgconfig(xlnt)
#BuildRequires: pkgconfig(pthreads)
BuildRequires: pkgconfig(nlohmann_json)
BuildRequires: pkgconfig(qt5)
BuildRequires: pkgconfig(boost)
BuildRequires: pkgconfig(xlnt)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: pkgconfig(qt5)
BuildRequires: pkgconfig(threads)
%description
@ -33,9 +34,6 @@ BuildRequires: qt5-qtdeclarative-devel
%files
%{_bindir}/kima2
%{_datadir}/applications/kima2.desktop
%{_datadir}/icons/hicolor/scalable/apps/kima2.svg
%{_datadir}/kima2/Benutzerhandbuch.pdf
%changelog