Thomas Haller 0fd3ec81fd contrib/rpm: let NetworkManager-libnm and NetworkManager-glib of differing version conflict ... Since commit "c920909 contrib/rpm: put translations in NetworkManager-libnm and NetworkManager-glib packages", both subpackages install the same translation files without a direct dependency between the two packages. Thus, if a user tries to update only one of the two subpackages, it will fail during the installation due to conflicting files. Fix that by having the subpackages conflict (per version). This way, the conflict is detected before starting the installation. https://bugzilla.redhat.com/show_bug.cgi?id=1406454 (cherry picked from commit b85b8ed6fa)		2017-01-20 17:11:55 +01:00
..
editors	contrib: add emacs config for hacking on NM	2015-08-11 13:42:26 -04:00
fedora	contrib/rpm: let NetworkManager-libnm and NetworkManager-glib of differing version conflict	2017-01-20 17:11:55 +01:00
scripts	contrib: add macsec test script	2017-01-16 17:47:10 +01:00
travis	contrib/travis: the test outputs are now logged more sanely	2016-12-05 13:54:35 +01:00