Commit Graph

119 Commits

Author SHA1 Message Date
Jo Vandeginste 067f4ccfd0 Add back newlines after sections with macro expansion
The previous commit eats too much whitespace after the section headers
(`%pre`, `%post` etc.). There should remain a newline.

Correct versions (for `%pre`):

```
%pre
ugrade () {
```

and

```
%pre -e
upgrade() {
```

Without this patch, we get these (wrong):

```
%pre ugrade () {
```

and

```
%pre -e upgrade() {
```

(exact number of spaces can be different, but should not be relevant)

Fixes #1750

Signed-off-by: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
2021-06-19 00:16:58 -07:00
Julian Trzeciak 8a40cd1db7 rpm: add option to enable install-time macro expansion in scripts
- spec file sections affected: %pre %post %preun %postun
2020-03-07 19:46:46 -08:00
Jordan Sissel a996a8a404 Allow noarch rpms to contain binaries.
The reasoning for this is that some projects may ship single packages
containing everything necessary. For example, `Netty` and `JRuby` are
Java projects which contain platform-specific (for many platforms)
libraries -- for example, libjffi.
2017-12-24 06:00:04 -08:00
Torsten Schmidt c4b3cd863e fix: install loop problem in rpm.erb
When using install command (from /usr/bin/install) in after_install
shell in creates a endless loop, because it jumps to funtion beginning
of install(). So it's best practise to rename it to _install() to avoid
collision with /usr/bin/install command
2017-12-23 12:59:44 -08:00
luto 3338aa8f4b remove trailing slash from --prefix option in rpm-packages, fixes #819 2016-06-23 02:18:01 +02:00
Michal Mach 18a4ab964d Fix for ignoring --rpm-tag option on command line 2016-06-15 18:40:52 +00:00
Jordan Sissel 93382dcdb3 Merge pull request #687 from vStone/feature/rpm-custom-requires
rpm: Add a option to insert raw Require statements
2015-11-07 12:01:22 -08:00
Matt Sharpe 0247b382a4 #903 add --rpm-summary flag and tests 2015-08-10 22:56:24 +10:00
Joseph Frazier 3164452148 Don't crash on empty description when building RPM
Closes #825, #973
2015-08-06 22:58:38 -07:00
Jordan Sissel ae9de095dc Merge pull request #692 from adamonduty/rpm_dist
Support RPM dist tag
2015-06-30 10:39:14 -07:00
Daniel Haskin 45c9d09edf Add to pre- and post- removal scripts to make them safer 2015-05-02 11:50:41 -06:00
Jordan Sissel 162a2e2a71 rpm v5 changes the name of the file digest macro
This sets both macros (rpm v4.9, rpm v5.4) now just in case.

This fixes test failures on OSX when setting --rpm-digest sha1
2015-04-14 00:05:49 -07:00
Daniel Haskin bd6902de2b #875 Fix cases where upgrade or install scripts are specified, but not both 2015-04-09 23:00:25 -06:00
Dave Anderson 05fb31d299 Second %pre should be %post
Fixes https://github.com/jordansissel/fpm/issues/803
2014-12-09 13:00:27 -07:00
Maxime Caumartin 8d38574b7e Add input and output rpm trigger support
This adds several rpm-specific flags:

--before-install
--after-install
--before-uninstall
--after-target-uninstall

Fixes #626 (merged by hand)
2014-10-25 05:36:37 +00:00
Jordan Sissel 7f11bc00e9 Somehow the templates were syntactically invalid? I dunno. Fixed. 2014-10-25 04:51:53 +00:00
Daniel Haskin 3c3c867a7c Merge into scriptmap in the name of elegance 2014-09-19 07:23:15 -06:00
Daniel Haskin 6ad6767844 Pass other scripts through 2014-09-19 07:10:51 -06:00
Daniel Haskin bb8409f906 Complete first hack at RPM and options 2014-09-15 07:08:34 -06:00
Jan Vansteenkiste a49084b7c4 rpm: Add a option to insert raw tag statements
This can be useful to have requirements for different stages.

Examples:

    --rpm-tag 'Requires(post): /usr/sbin/alternatives'
    --rpm-tag 'Requires(preun): /usr/sbin/alternatives'
2014-07-25 08:15:07 +02:00
Jordan Sissel b3d315b470 Merge branch 'master' of https://github.com/remh/fpm into remh-master
Conflicts:
	lib/fpm/package/rpm.rb
2014-06-18 06:52:42 +00:00
Adam Lamar 9bdd40ddec Support RPM dist tag
When --rpm-dist is specified, pass the dist tag to rpmbuild and
correctly name the file to ensure packages can be built with a
specific distribution in mind.
2014-05-01 18:33:49 +01:00
Jordan Sissel 4a6e7b3acb Merge pull request #676 from robkinyon/rpm_arch
Fixes for RPM and --architecture
2014-04-22 17:46:38 -07:00
Jordan Sissel c12991dc90 Allow forcing ownership even when using --rpm-use-file-permissions
The rpm-use-file-permissions setting asks each file who owns it and what
the mode is. Sometimes you only want the mode, or sometimes the user is
not correct for deployment. Now, specifying --rpm-user will force the
owner to be the given user but still respect the file modes gathered
by --rpm-use-file-permissions.

The intent of this change is:

* --rpm-use-file-permissions still works the same, when alone
* --rpm-user forces the 'user' owner regardless of the above
* --rpm-group forces the 'group' owner regardless of the above

This was identified by https://logstash.jira.com/browse/LOGSTASH-2012
2014-04-22 18:43:37 +00:00
Rob Kinyon 9cdfe65db6 BuildArch isn't needed for any purpose 2014-04-17 20:25:22 -04:00
Remi Hakim 487df5a192 Move rpm specific packages scripts to a more adequate location 2014-04-14 15:25:25 +02:00
Remi Hakim abdbbf9a18 verify_script => verifyscript 2014-03-18 11:04:00 -04:00
Remi Hakim 1c49288d48 Add support for pretrans script 2014-03-18 11:00:50 -04:00
Remi Hakim 9c5815e96e Add postttrans support 2014-03-17 19:55:29 -04:00
Remi Hakim 2bb380d931 Fixes the specs 2014-03-14 17:02:44 -04:00
Remi Hakim 7a988d3205 Pass the proper keyword for verify script 2014-03-14 16:56:55 -04:00
Remi Hakim e7d7755d00 First pass at adding support for rpm "verify" script 2014-03-14 16:44:07 -04:00
Jordan Sissel 6e147c3e28 Merge pull request #528 from cdodd/master
Fixed typo in spec file template
2013-10-22 21:24:15 -07:00
Pranay Kanwar 3c7e0810b7 Move staging to BUILD copy logic from template to library 2013-09-14 08:27:41 -07:00
Craig Dodd 8320b1b39c Fixed typo in spec file template 2013-08-19 16:46:55 +01:00
Adam Stephens 040ae1832a rpm config files can and should contain attributes 2013-07-05 09:32:05 -04:00
Jordan Sissel a27292fbb4 Merge pull request #428 from phrawzty/defattr
add args for controlling rpm %defattr
2013-05-07 09:59:12 -07:00
Jordan Sissel dd54ded77a - send a message to folks editing the rpm spec that I welcome them to
file whatever feature requests are necessary to avoid them needing to
  edit the rpm spec ever again ;)
2013-05-07 09:32:45 -07:00
phrawzty 89ec9715c2 add args for controlling rpm %defattr 2013-05-07 14:40:04 +02:00
Jordan Sissel dd343cc77e - fix test breakages after #422 2013-05-07 00:02:04 -07:00
Adam Stephens 2fbafe6fb2 fix typo in RPM template 2013-05-02 21:22:21 -04:00
Adam Stephens 997c91b2d2 add RPM flags for AutoReq and AutoProv; add RPM macro support for %filter_from_provides and %filter_from_requires 2013-05-02 16:53:04 -04:00
Adam Stephens 7ecd44b214 add --rpm-autoreqprov flag to enable AutoReqProv in RPM spec 2013-05-02 14:10:20 -04:00
Pranay Kanwar b00ade0bc8 Do no generate empty prefix 2013-04-22 11:12:33 +05:30
Pranay Kanwar ebb294acab #353 Remove trailing slash from prefix 2013-04-17 21:40:46 +05:30
Pranay Kanwar 991ab604de #413 Fix name for directories and config files 2013-04-17 21:11:29 +05:30
Pranay Kanwar f4906879ca Auto add directories for rpm 2013-04-17 20:19:01 +05:30
Jordan Sissel 263a579fd4 - fix breakage in ruby 1.8.7 2013-03-21 15:38:31 -07:00
Jordan Sissel 6db0940ec5 - rename 'output_file_line' -> 'rpm_file_entry'
- fix spec generation
- some style cleanup
2013-03-21 15:37:11 -07:00
rhodesp 12470d523e Updates to support --rpm-use-file-permissions 2013-03-06 18:28:14 +00:00