Switch libdnf to projectatomic branch

We previously added a projectatomic/libdnf fork. I just pushed an
`rpmostree-branch` to there with one PR on top. This is an unfortunate turn but
the C++ thing still needs to be worked out.

Obviously we don't want a permanent fork, but I find it hard to justify spending
a whole lot of time pitching in to help with the libdnf C++ conversion versus
all the other work I could be doing.

Update submodule: libdnf

Closes: #1114
Approved by: jlebon

.gitmodules

@@ -3,4 +3,4 @@
 	url = https://git.gnome.org/browse/libglnx
 [submodule "libdnf"]
 	path = libdnf
-	url = https://github.com/rpm-software-management/libdnf
+	url = https://github.com/projectatomic/libdnf

Makefile.am

@@ -33,7 +33,9 @@ endif
 RPM_OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -e $(srcdir)/.git; then git describe --abbrev=42 --tags --always HEAD; fi)
 
 ACLOCAL_AMFLAGS += -I m4 ${ACLOCAL_FLAGS}
+# WITH_SWDB is a hackaround for it being used in libdnf headers
 AM_CPPFLAGS += -DDATADIR='"$(datadir)"' \
+	-DWITH_SWDB=0 \
 	-DLIBEXECDIR='"$(libexecdir)"' \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
         -DRPM_OSTREE_FEATURES='"$(RPM_OSTREE_FEATURES)"' \

configure.ac

@@ -199,6 +199,7 @@ dnl arbitrary path - we don't actually install there.
      -DSYSCONF_INSTALL_DIR:PATH=/usr/libexec/rpm-ostree/etc \
      -DSHARE_INSTALL_PREFIX:PATH=/usr/libexec/rpm-ostree/share \
      -DBUILD_SHARED_LIBS:BOOL=ON \
+     -DWITH_SWDB:BOOL=0 \
      ${cmake_args} ../libdnf) || exit 1
 
 AC_CONFIG_FILES([

libdnf

@@ -1 +1 @@
-Subproject commit 022365553ae6ebde81bada074c36abebaee0ab6a
+Subproject commit e1950638d5f081efc93e8127fab9d51b97c4d6af

src/libpriv/rpmostree-jigdo-client.c

@@ -34,8 +34,8 @@
 #include "rpmostree-rpm-util.h"
 #include "rpmostree-output.h"
 // For the jigdo Requires parsing
-#include <libdnf/dnf-reldep-private.h>
-#include <libdnf/dnf-sack-private.h>
+#include <libdnf/dnf-reldep-private.hpp>
+#include <libdnf/dnf-sack-private.hpp>
 
 #include <string.h>
 #include <stdlib.h>