From: Ronan Le Martret Date: Mon, 14 May 2018 16:21:23 +0000 (+0200) Subject: packaging: Update spec and deb packaging X-Git-Tag: 5.1.0^0 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-binder.git;a=commitdiff_plain;h=b61a20c6244f2009719b6b3df8292a8196323215 packaging: Update spec and deb packaging - sort files by packaging type Change-Id: I048cfd6537723f421d2395cea80203c6364ae02e Signed-off-by: Ronan Le Martret --- diff --git a/conf.d/packaging/agl-app-framework-binder.dsc b/conf.d/packaging/deb/agl-app-framework-binder.dsc similarity index 65% rename from conf.d/packaging/agl-app-framework-binder.dsc rename to conf.d/packaging/deb/agl-app-framework-binder.dsc index 96612fbe..564083fd 100644 --- a/conf.d/packaging/agl-app-framework-binder.dsc +++ b/conf.d/packaging/deb/agl-app-framework-binder.dsc @@ -5,8 +5,8 @@ Architecture: any Version: 2.0-0 Maintainer: unknown Standards-Version: 3.8.2 -Homepage: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder -Build-Depends: debhelper (>= 5), +Homepage: https://gerrit.automotivelinux.org/gerrit/src/app-framework-binder +Build-Depends: debhelper (>= 5), pkg-config, dpkg-dev, libmicrohttpd-dev (>= 0.9.54), cmake, @@ -16,4 +16,6 @@ Build-Depends: debhelper (>= 5), libgcrypt20-dev, libjson-c-dev, libmagic-dev -Debtransform-Tar: agl-app-framework-binder_2.0.orig.tar.gz +DEBTRANSFORM-RELEASE: 1 +Files: + app-framework-binder_2.0.tar.gz diff --git a/conf.d/packaging/debian.agl-app-framework-binder-bin.install b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install similarity index 86% rename from conf.d/packaging/debian.agl-app-framework-binder-bin.install rename to conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install index 3faebfb3..17c19520 100644 --- a/conf.d/packaging/debian.agl-app-framework-binder-bin.install +++ b/conf.d/packaging/deb/debian.agl-app-framework-binder-bin.install @@ -1,4 +1,4 @@ -/opt/AGL/lib/*/libafbwsc.so.1.0 +/opt/AGL/lib/*/libafbwsc.so.1.1 /opt/AGL/lib/*/libafbwsc.so.1 /opt/AGL/lib/*/afb/authLogin.so /opt/AGL/lib/*/afb/demoPost.so @@ -12,3 +12,4 @@ /opt/AGL/bin/afb-client-demo /opt/AGL/bin/afb-genskel /etc/profile.d/AGL_app-framework-binder.sh +/opt/AGL/lib/*/afb/monitoring/* diff --git a/conf.d/packaging/debian.agl-app-framework-binder-dev.install b/conf.d/packaging/deb/debian.agl-app-framework-binder-dev.install similarity index 100% rename from conf.d/packaging/debian.agl-app-framework-binder-dev.install rename to conf.d/packaging/deb/debian.agl-app-framework-binder-dev.install diff --git a/conf.d/packaging/debian.changelog b/conf.d/packaging/deb/debian.changelog similarity index 100% rename from conf.d/packaging/debian.changelog rename to conf.d/packaging/deb/debian.changelog diff --git a/conf.d/packaging/debian.compat b/conf.d/packaging/deb/debian.compat similarity index 100% rename from conf.d/packaging/debian.compat rename to conf.d/packaging/deb/debian.compat diff --git a/conf.d/packaging/debian.control b/conf.d/packaging/deb/debian.control similarity index 93% rename from conf.d/packaging/debian.control rename to conf.d/packaging/deb/debian.control index 0c57db96..29940f19 100644 --- a/conf.d/packaging/debian.control +++ b/conf.d/packaging/deb/debian.control @@ -1,7 +1,7 @@ Priority: optional Maintainer: unknown Source: agl-app-framework-binder -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 5),pkg-config, libmicrohttpd-dev (>= 0.9.55), cmake, libsystemd-dev (>= 222), diff --git a/conf.d/packaging/debian.rules b/conf.d/packaging/deb/debian.rules similarity index 100% rename from conf.d/packaging/debian.rules rename to conf.d/packaging/deb/debian.rules diff --git a/conf.d/packaging/agl-app-framework-binder.spec b/conf.d/packaging/rpm/agl-app-framework-binder.spec similarity index 65% rename from conf.d/packaging/agl-app-framework-binder.spec rename to conf.d/packaging/rpm/agl-app-framework-binder.spec index 9f3a2509..c35cffbb 100644 --- a/conf.d/packaging/agl-app-framework-binder.spec +++ b/conf.d/packaging/rpm/agl-app-framework-binder.spec @@ -6,14 +6,16 @@ %define __cmake cmake Name: agl-app-framework-binder +# WARNING {name} is not used for tar file name in source nor for setup +# Check hard coded values required to match git directory naming Version: 2.0 Release: 0 -License: GPL-2.0 -Summary: app-framework-binder +License: Apache-2.0 +Summary: AGL app-framework-binder Group: Development/Libraries/C and C++ Url: https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/app-framework-binder -Source: %{name}_%{version}.orig.tar.gz -#BuildRequires: gdb +Source: app-framework-binder-%{version}.tar.gz +#BuildRequires: gdb BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.55 BuildRequires: make BuildRequires: cmake @@ -24,23 +26,26 @@ BuildRequires: libgcrypt-devel BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(json-c) BuildRequires: file-devel +BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description -app-framework-binder +Provides a test agl binder service which can be used to test agl bindings on Linux PC +This service is evolving permanently and is only designed as a helper for developper. %package devel -Summary: app-framework-binder-devel Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Provides: pkgconfig(%{name}) = %{version} - +Summary: AGL app-framework-binder-devel %description devel -app-framework-binder-devel +Provides a test agl binder service which can be used to test agl bindings on Linux PC +This service is evolving permanently and is only designed as a helper for developper. + %prep -%setup -q +%setup -q -n app-framework-binder-%{version} %build export PKG_CONFIG_PATH=%{_libdir}/pkgconfig @@ -53,8 +58,8 @@ export PKG_CONFIG_PATH=%{_libdir}/pkgconfig %make_install mkdir -p %{buildroot}%{_sysconfdir}/profile.d -cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/AGL_%{name}.sh -#---------- AGL %{name} options Start ---------" +cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/AGL-%{name}.sh +#---------- AGL %%{name} options Start ---------" # Object: AGL cmake option for binder/bindings export LD_LIBRARY_PATH=%{_libdir}:\${LD_LIBRARY_PATH} export LIBRARY_PATH=%{_libdir}:\${LIBRARY_PATH} @@ -81,15 +86,15 @@ EOF %{_libdir}/afb/afb-dbus-binding.so %{_libdir}/afb/authLogin.so %{_libdir}/libafbwsc.so.1 -%{_libdir}/libafbwsc.so.1.0 +%{_libdir}/libafbwsc.so.1.1 #app-framework-binder demo %{_libdir}/afb/demoContext.so %{_libdir}/afb/demoPost.so %{_libdir}/afb/helloWorld.so %{_libdir}/afb/tic-tac-toe.so -%{_libdir}/afb/monitoring/* -%{_sysconfdir}/profile.d/AGL_%{name}.sh +%{_libdir}/afb/ave.so +%config(noreplace) %{_sysconfdir}/profile.d/AGL-%{name}.sh #app-framework-binder monitoring %dir %{_libdir}/afb/monitoring @@ -102,5 +107,13 @@ EOF %dir %{_includedir} %dir %{_includedir}/afb %{_includedir}/afb/*.h +%{_includedir}/afb/*.hpp +%{_includedir}/afb/afb-binding %dir %{_libdir}/pkgconfig %{_libdir}/pkgconfig/*.pc + +%changelog +* Wed Sep 27 2017 Dominig +- move to git repo +* Tue Aug 01 2017 Ronan +- initial creation