public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fedpkg: fix patch

This commit is contained in:
Mario Rodas 2018-11-28 07:55:49 -05:00
parent 947be9e992
commit 7905c38c74
No known key found for this signature in database
GPG Key ID: 325649BCA6D53027
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/fedpkg-buildfix.diff
View File

@ -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']),
]
)

6
pkgs/development/python-modules/fedpkg/default.nix
View File

@ -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

16
pkgs/development/python-modules/fedpkg/fix-paths.patch Normal file
View File

@ -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'],