Compare commits

...

2 commits

Author SHA1 Message Date
5aa4e3a5f0 typo 2019-10-11 12:49:32 +02:00
77226f294b rpm builds now 2019-10-11 12:48:54 +02:00
2 changed files with 16 additions and 11 deletions

View file

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

View file

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