From 7905c38c74a730951ec0a87ba45780e107f86cc5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 28 Nov 2018 07:55:49 -0500
Subject: [PATCH] fedpkg: fix patch

---
 .../python-modules/fedpkg-buildfix.diff          | 14 --------------
 .../python-modules/fedpkg/default.nix            |  6 ++----
 .../python-modules/fedpkg/fix-paths.patch        | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/python-modules/fedpkg-buildfix.diff
 create mode 100644 pkgs/development/python-modules/fedpkg/fix-paths.patch

diff --git a/pkgs/development/python-modules/fedpkg-buildfix.diff b/pkgs/development/python-modules/fedpkg-buildfix.diff
deleted file mode 100644
index b9d46d7c741..00000000000
--- a/pkgs/development/python-modules/fedpkg-buildfix.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py	2014-02-04 16:12:37.021993713 +0100
-+++ b/setup.py	2014-02-04 16:11:42.653995607 +0100
-@@ -13,8 +13,8 @@
-     package_dir = {'': 'src'},
-     packages = ['fedpkg'],
-     scripts = ['src/bin/fedpkg'],
--    data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']),
--                  ('/etc/rpkg', ['src/fedpkg.conf']),
--                  ('/usr/libexec/', ['src/fedpkg-fixbranches.py']),
-+    data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']),
-+                  ('etc/rpkg', ['src/fedpkg.conf']),
-+                  ('libexec/', ['src/fedpkg-fixbranches.py']),
-                  ]
- )
diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix
index 0230466e6e3..e23a3e4a0d6 100644
--- a/pkgs/development/python-modules/fedpkg/default.nix
+++ b/pkgs/development/python-modules/fedpkg/default.nix
@@ -3,16 +3,14 @@
 buildPythonPackage rec {
   pname = "fedpkg";
   version = "1.29";
-  name  = "${pname}-${version}";
 
   disabled = isPy3k;
 
   src = fetchurl {
-    url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2";
+    url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2";
     sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631";
   };
-
-  #patches = [ ../development/python-modules/fedpkg-buildfix.diff ];
+  patches = [ ./fix-paths.patch ];
   propagatedBuildInputs = [ rpkg offtrac urlgrabber ];
 
   doCheck = false; # requires fedora_cert which isn't used anymore
diff --git a/pkgs/development/python-modules/fedpkg/fix-paths.patch b/pkgs/development/python-modules/fedpkg/fix-paths.patch
new file mode 100644
index 00000000000..1831337a585
--- /dev/null
+++ b/pkgs/development/python-modules/fedpkg/fix-paths.patch
@@ -0,0 +1,16 @@
+--- orig/setup.py
++++ new/setup.py
+@@ -27,10 +27,10 @@
+         'bin/fedpkg',
+         'bin/fedpkg-stage',
+     ],
+-    data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']),
+-                ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
++    data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']),
++                ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf',
+                                'conf/etc/rpkg/fedpkg-stage.conf']),
+-                ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
++                ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']),
+                 ],
+ 
+     tests_require=['nose', 'mock'],