Update/fix rpm and deb packaging

- fix packaging to be compliant with latest subprojects hierarchy
  (Master, Master-Next, ElectricEel, ...)
- fix rpmlint warnings/error

Change-Id: Ib8c2014624542d3dfb81818ed605dc7a2dedf2c5
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

1 files changed, 6 insertions, 5 deletions

diff --git a/conf.d/packaging/rpm/agl-xds-server.spec b/conf.d/packaging/rpm/agl-xds-server.spec
index 74e5b33..ee59be1 100644
--- a/conf.d/packaging/rpm/agl-xds-server.spec
+++ b/conf.d/packaging/rpm/agl-xds-server.spec
@@ -6,14 +6,15 @@
 %global debug_package %{nil}
 
 Name:           agl-xds-server
-Version:        1.1.1
+Version:        0.0.0
 Release:        0
 License:        Apache-2.0
 Summary:        XDS-server
-Url:            https://github.com/iotbzh/xds-server.git
-Source0:        xds-server_linux-amd64-v%{version}_2018-04-05_111758.zip
+Url:            https://gerrit.automotivelinux.org/gerrit/p/src/xds/xds-server.git
+Source0:        xds-server_linux-amd64-%{version}.zip
 BuildRequires:  unzip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Group:          Development/Tools/Debuggers
 
 # for now still embedded with xds
 # Requires:       syncthing
@@ -55,8 +56,8 @@ sed -e "s;@XDS_INSTALL_BIN_DIR@;%{_bindir};g" ./conf.d/etc/profile.d/xds-server.
 %{_bindir}/syncthing-inotify
 %dir %{_sysconfdir}/xds
 %dir %{_sysconfdir}/xds/server
-%{_sysconfdir}/default/xds-server
-%{_sysconfdir}/xds/server/*
+%config %{_sysconfdir}/default/xds-server
+%config %{_sysconfdir}/xds/server/*
 %config %{_sysconfdir}/profile.d/%{name}.sh
 %dir %{_userunitdir}
 %{_userunitdir}/xds-server.service