Commit Graph

2034 Commits

Author SHA1 Message Date
Jordan Sissel e9a6f63e2e Merge pull request #1203 from liger1978/fix_merge
Ensured result is not nil. Fixes #1202.
2016-10-15 19:33:10 -07:00
Jordan Sissel 9af51d7364 Merge pull request #1210 from nicobrevin/bugfix-virtualenv-various
Bugfix virtualenv various
2016-10-15 19:24:17 -07:00
Jordan Sissel 0926aa195e Merge pull request #1196 from hatt/task/1140-update-freebsd-arch
Use global architecture switch for FreeBSD ABI
2016-10-15 19:23:18 -07:00
Nick Griffiths d9490a520f Dumb attempt at getting virtualenv tests to run in travis/linux 2016-10-15 17:07:57 +13:00
Nick Griffiths 4cdab37074 Fix failing virtualenv test 2016-10-15 16:42:19 +13:00
Nick Griffiths fc648021e4 Cope with longer tmp dirs - shebangs must be < 128 chars 2016-10-15 16:11:17 +13:00
Jordan Sissel 06a7f6947f I don't use dk anymore 2016-10-10 03:01:05 -07:00
Richard Grainger 33216ad7d7 Ensured result is not nil. Fixes #1202. 2016-10-09 22:36:11 +01:00
Matt Sharpe 2e8583e42e Use global architecture switch for FreeBSD ABI 2016-09-28 17:36:28 +10:00
Jordan Sissel cda8262bab Version bump 2016-09-15 10:35:27 -07:00
Jordan Sissel b0367de0a2 Don't include 'pyc' (python bytecode) files in the fpm gem package. Will prevent #1191 from happening again. 2016-09-15 10:33:28 -07:00
Jordan Sissel 40aa7cf5ca Move fpm version query behavior to `run` method.
A bug pointed out by #1162 showed that `fpm --version` would fail when
a .fpm file was loaded.

Moving the short `fpm --version` handling to the `run` method lets us do
this check before we load FPMOPTS env or .fpm files.

Updated the tests to only try calling with a lone `-v` or `--version`
flag to verify this works with and without a .fpm file.

Fixes #1162 and #1125. Original work by @drwl!
2016-09-11 23:48:39 -07:00
Andrew Lee a6f25b9fda Fix --version when .fpm file exists 2016-09-11 23:48:17 -07:00
Jordan Sissel a9401ca0f5 Merge pull request #1158 from jomach/master
Install rpm-build dependencies
2016-09-11 21:43:10 -07:00
Jordan Sissel 9ec2b9fde6 Merge pull request #1184 from thijstriemstra/patch-1
fix typo
2016-09-11 21:40:14 -07:00
Jordan Sissel b48397b8b4 Merge pull request #1188 from hatt/feature/1187-longer-flags
Add long flag options for chdir, input, and output
2016-09-11 21:34:10 -07:00
Matt Sharpe 0e9e8f0a43 Add long flag options for chdir, input, and output
The flags for chdir, input, and output aren't immediately intuitive
as to what they're short for. This commit adds long versions and a
spec stub for chdir. Resolves #1187.
2016-09-02 17:19:12 +10:00
Thijs Triemstra 441d8e90d3 fix typo 2016-08-30 00:28:09 +02:00
Jordan Sissel 5b5d7efb31 Fix blank summary bug. When using the description field for the summary, instead of picking the first line, we now pick the first non-empty line. Fixes #1186. 2016-08-27 21:41:00 -07:00
Jordan Sissel 99f5e52fda Merge pull request #1182 from liger1978/fix_1179
Fix #1179 Remove .packlist files and empty parent directories from CPAN packages
2016-08-23 19:08:00 -07:00
Richard Grainger 5981a29f76 Fix #1179 Remove .packlist files and empty parent directories from CPAN packages 2016-08-23 23:47:20 +01:00
Jordan Sissel ab50185c48 Merge pull request #1178 from liger1978/fix-1114
Fix #1114 by looking for new-style keys in CPAN metadata
2016-08-19 08:58:05 -07:00
Richard Grainger b6ee8799ce Fix #1114 by looking for new-style keys in CPAN metadata 2016-08-19 15:49:43 +01:00
Jordan Sissel 64897df7c7 Merge pull request #1154 from Romain-Geissler-1A/fix-pacman-dependency-regex
Fix pacman dependency regex.
2016-08-08 13:30:51 -07:00
Jordan Sissel 1945b83ff7 Merge pull request #1170 from lloydpick/fix-apk-loading
add missing apk require
2016-08-04 12:26:36 -07:00
Lloyd Pick 6de809631a add missing apk require 2016-08-04 20:20:08 +01:00
Jordan Sissel 060f580b3c Merge pull request #1168 from kylegato/patch-1
Update README.md with freebsd in the targets list
2016-08-02 16:45:21 -07:00
Kyle Gato 4ba6b89ba0 Update README.md with freebsd in the targets list
Adding freebsd to the README due to recently introduced functionality.
2016-08-02 16:00:18 -07:00
Jordan Sissel 40ec0c3576 Merge pull request #1139 from luto/bugfix/1124
fix --workdir not having an effect on the build and staging dirs, fixes #1124
2016-07-25 16:14:44 -07:00
Jordan Sissel 8114803a53 Merge pull request #1030 from ZeroPointEnergy/feature/gem_set_shebang
gem: make it posssible to set the shebang
2016-07-22 10:49:14 -07:00
Andreas Zuber be71a16a40 gem: make sure only the shebang on the very first line of the script gets replaced 2016-07-22 09:16:48 +02:00
Andreas Zuber 8add9bcdd6 gem: make it posssible to set the shebang
This makes it possible to create packages from gems for ruby versions
which are not currently installed on the machine you build the package on.
2016-07-22 09:02:39 +02:00
Jorge Machado f5984e25e5 Install rpm-build dependencies 2016-07-11 08:37:39 +02:00
Romain Geissler 1cef669d07 Fix pacman dependency regex. 2016-07-05 21:34:50 +02:00
Jordan Sissel 398eeafde9 Version bump 2016-06-30 14:51:35 -07:00
Jordan Sissel b69d022526 Merge pull request #1146 from mjhoffman65/json_dependency_fix
prevents json dependency from creeping to version 2.0
2016-07-01 14:29:22 -07:00
Matt Hoffman c05bf2b111 prevents json dependency from creeping to version 2.0
json 2.0.1 was published today and requires ruby's version
to be greater than 2.0.
2016-07-01 11:47:13 -04:00
Jordan Sissel 103602c832 Merge pull request #1137 from luto/bugfix/819
remove trailing slash from --prefix option in rpm-packages, fixes #819
2016-06-23 18:57:55 -07:00
luto 3338aa8f4b remove trailing slash from --prefix option in rpm-packages, fixes #819 2016-06-23 02:18:01 +02:00
luto 454754064f fix --workdir not having an effect on the build and staging dirs, fixes #1124 2016-06-22 01:50:44 +02:00
Jordan Sissel 7a7d057109 Make `requirements.txt` detected automatically
This removes the --requirements boolean flag in favor of a check that
will automatically assume 'requirements.txt' if the given input argument
is a path with basename (last part of the path) of "requirements.txt".
2016-06-18 13:53:38 -07:00
Nick Griffiths 66e59e79e8 Support building a virtualenv from local requirements.txt 2016-06-18 13:37:24 -07:00
Nick Griffiths d0eaf77921 Add some basic specs for the virtualenv package 2016-06-18 13:37:24 -07:00
Jordan Sissel e0ec0f3235 Merge pull request #1113 from slact/archlinux_groups_fix
'group' field may be absent in a pacman package, which prevented a valid build
2016-06-20 12:28:23 -07:00
TomyLobo 7e91faf92d Skip certain control file entries if their lists are empty.
For #1126
2016-06-18 04:38:28 -07:00
Jordan Sissel 531f349886 Merge pull request #1134 from specnazzz/fix-rpm-tag
Fix for ignoring --rpm-tag option on command line
2016-06-20 12:04:49 -07:00
Michal Mach 18a4ab964d Fix for ignoring --rpm-tag option on command line 2016-06-15 18:40:52 +00:00
Jordan Sissel fb6d450de7 Version bump 2016-06-05 02:57:43 -07:00
Jordan Sissel 652a068f22 Merge pull request #1132 from ketan/fix-liblzma-require
Lazily require xz at the last possible moment to avoid dependency on liblzma.so.5
2016-06-10 10:17:14 -07:00
Ketan Padegaonkar e979375e0a Lazily require xz at the last possible moment to avoid dependency on liblzma.so.5
Fixes #1090
2016-06-10 22:18:15 +05:30