From 1f2d0f34a3d03ff2983ecd98faad097131d460c2 Mon Sep 17 00:00:00 2001 From: Chupligin Sergey Date: Mon, 10 Jun 2019 16:50:20 +0300 Subject: [PATCH] [packaging] Remove requires of qt --- nemo-ssu-repos.pro | 6 ------ rpm/nemo-ssu-repos.spec | 15 ++++++++------- ssu/ssu.pro | 9 --------- 3 files changed, 8 insertions(+), 22 deletions(-) delete mode 100644 nemo-ssu-repos.pro delete mode 100644 ssu/ssu.pro diff --git a/nemo-ssu-repos.pro b/nemo-ssu-repos.pro deleted file mode 100644 index 3ecabc7..0000000 --- a/nemo-ssu-repos.pro +++ /dev/null @@ -1,6 +0,0 @@ -contains(QT_VERSION, ^4\.[0-7]\..*) { - error("Can't build with Qt version $${QT_VERSION}. Use at least Qt 4.8.") -} - -TEMPLATE = subdirs -SUBDIRS = ssu diff --git a/rpm/nemo-ssu-repos.spec b/rpm/nemo-ssu-repos.spec index 0f49f95..3f69ada 100644 --- a/rpm/nemo-ssu-repos.spec +++ b/rpm/nemo-ssu-repos.spec @@ -7,8 +7,6 @@ Group: System/Base BuildArch: noarch License: GPLv2 Source0: %{name}-%{version}.tar.gz -BuildRequires: pkgconfig(QtCore) -BuildRequires: oneshot %description %{summary}. @@ -17,7 +15,10 @@ BuildRequires: oneshot Summary: Sample vendor configuration data Group: System/Base Requires: ssu >= 0.31 +Requires: oneshot + Provides: ssu-vendor-data + Obsoletes: nemo-ssu-repos-release Obsoletes: nemo-ssu-repos-mer-tools-release Obsoletes: nemo-ssu-repos-adaptation-release @@ -26,8 +27,6 @@ Obsoletes: nemo-ssu-repos-rnd Obsoletes: nemo-ssu-repos-mer-tools-rnd Obsoletes: nemo-ssu-repos-adaptation-rnd Obsoletes: nemo-ssu-repos-adaptation-common-rnd -Requires: oneshot -%{_oneshot_requires_post} %description -n ssu-vendor-data-nemo %{summary}. A vendor (including Nemo) is supposed to put those configuration on device. @@ -44,9 +43,11 @@ Requires: oneshot %setup -q -n %{name}-%{version} %build -qmake DEFINES+='TARGET_ARCH=\\\"\"%{_target_cpu}\"\\\"' -recursive -make %{?_smp_mflags} +mkdir -p $RPM_BUILD_ROOT %install -make INSTALL_ROOT=%{buildroot} install +install -D -m 644 ssu/ssu.ini $RPM_BUILD_ROOT%{_sysconfdir}/ssu/ssu.ini +install -D -m 644 ssu/repos.ini $RPM_BUILD_ROOT%{_datadir}/ssu/repos.ini +install -D -m 644 ssu/ssu-defaults.ini $RPM_BUILD_ROOT%{_datadir}/ssu/ssu-defaults.ini +install -D -m 644 ssu/board-mappings.ini $RPM_BUILD_ROOT%{_datadir}/ssu/board-mappings.ini diff --git a/ssu/ssu.pro b/ssu/ssu.pro deleted file mode 100644 index 52ec90a..0000000 --- a/ssu/ssu.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = subdirs - -config.files = ssu.ini -config.path = /etc/ssu - -static_config.files = repos.ini ssu-defaults.ini board-mappings.ini -static_config.path = /usr/share/ssu - -INSTALLS += config static_config