Use relative patch to install gbp.conf

to make pip install --user work

3 files changed, 4 insertions, 2 deletions

diff --git a/debian/git-buildpackage.install b/debian/git-buildpackage.install
index 1cf7c4ca..b54a3b88 100644
--- a/debian/git-buildpackage.install
+++ b/debian/git-buildpackage.install
@@ -29,4 +29,4 @@ usr/lib/python2.?/dist-packages/gbp/scripts/supercommand.py
 usr/lib/python2.?/dist-packages/gbp/tmpfile.py
 usr/lib/python2.?/dist-packages/gbp/tristate.py
 usr/lib/python2.?/dist-packages/gbp/version.py
-etc/git-buildpackage/gbp.conf
+usr/share/git-buildpackage/gbp.conf etc/git-buildpackage/gbp.conf
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index d184b329..a3ee87b5 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -161,6 +161,8 @@ rm -rf %{buildroot}
 WITHOUT_NOSETESTS=1 %{__python} ./setup.py install --root=%{buildroot} --prefix=/usr
 mkdir -p %{buildroot}/usr/share/%{name}
 mv %{buildroot}/usr/bin/gbp-builder-mock %{buildroot}/usr/share/%{name}/
+mkdir -p %{buildroot}/%{_sysconfdir}/git-buildpackage/
+mv %{buildroot}/usr/share/%{name}/gbp.conf %{buildroot}/%{_sysconfdir}/git-buildpackage/
 
 %if %{with docs}
 # Install man pages
diff --git a/setup.py b/setup.py
index 1a10b827..385d2f4c 100755
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ setup(name="gbp",
       scripts=['bin/git-pbuilder',
                'bin/gbp-builder-mock'],
       packages=find_packages(exclude=['tests', 'tests.*']),
-      data_files=[("/etc/git-buildpackage/", ["gbp.conf"]), ],
+      data_files=[("share/git-buildpackage/", ["gbp.conf"]), ],
       requires=["six"],
       setup_requires=setup_requires(),
       entry_points={