From 33d9a34de1065764fab074a4791140b4a47789f0 Mon Sep 17 00:00:00 2001 From: Marko Saukko Date: Tue, 15 Dec 2015 10:38:48 +0000 Subject: [PATCH] Fix license in packaging. [packaging] Fix license in .spec. Contributes to JB#33684 Signed-off-by: Marko Saukko --- .gitignore | 20 ++++++++++++++++++++ rpm/connectionagent-qt5.spec | 10 +++++++--- 2 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f99a421 --- /dev/null +++ b/.gitignore @@ -0,0 +1,20 @@ +*.o +*.so +moc_* +RPMS +Makefile +connd/connectionagent +connd/connectiond_adaptor.cpp +connd/connectiond_adaptor.h +connectionagentplugin/connectiond_interface.cpp +connectionagentplugin/connectiond_interface.h +connectionagentplugin/plugin.moc +documentation.list +installroot/ +test/auto/tst_connectionagent/tst_connectionagent +test/auto/tst_connectionagent/tst_connectionagent.moc +test/auto/tst_connectionagent_plugin/connectiond_interface.cpp +test/auto/tst_connectionagent_plugin/connectiond_interface.h +test/auto/tst_connectionagent_plugin/tst_connectionagent_plugintest +test/auto/tst_connectionagent_plugin/tst_connectionagent_plugintest.moc + diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec index 90ce421..0cd012b 100644 --- a/rpm/connectionagent-qt5.spec +++ b/rpm/connectionagent-qt5.spec @@ -4,13 +4,13 @@ Summary: User Agent daemon Version: 0.11.25 Release: 0 Group: Communications/Connectivity Adaptation -License: LGPLv2 -URL: http://github.com/lpotter/connectionagent +License: LGPLv2.1 +URL: https://git.merproject.org/mer-core/connectionagent Source0: %{name}-%{version}.tar.bz2 Requires: connman-qt5-declarative Requires: systemd Requires: systemd-user-session-targets -Requires: connman >= 1.21 +Requires: connman >= 1.21 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(connman-qt5) @@ -21,6 +21,10 @@ BuildRequires: pkgconfig(qt5-boostable) Provides: connectionagent > 0.10.1 Obsoletes: connectionagent <= 0.7.6 +# Because of systemctl-user +Requires(post): systemd +Requires(postun): systemd + %description Connection Agent provides multi user access to connman's User Agent. It also provides autoconnecting features.