From 08dc21b8f1f09af0a975dad144f8b6ffb535ffd7 Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Sun, 8 Dec 2024 23:22:18 -0800 Subject: [PATCH] Version bump and generate docs --- docs/changelog_links.rst | 20 ++++++++++++++++++++ docs/cli-reference.rst | 24 +++++++++++++++++++----- docs/packages/cli/deb.rst | 6 +++++- docs/packages/cli/rpm.rst | 2 ++ lib/fpm/version.rb | 2 +- 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/docs/changelog_links.rst b/docs/changelog_links.rst index 9a1155f677..5e8b046d9b 100644 --- a/docs/changelog_links.rst +++ b/docs/changelog_links.rst @@ -96,6 +96,7 @@ .. _#1523: https://github.com/jordansissel/fpm/issues/1523 .. _#1528: https://github.com/jordansissel/fpm/issues/1528 .. _#1592: https://github.com/jordansissel/fpm/issues/1592 +.. _#1627: https://github.com/jordansissel/fpm/issues/1627 .. _#1636: https://github.com/jordansissel/fpm/issues/1636 .. _#1642: https://github.com/jordansissel/fpm/issues/1642 .. _#1667: https://github.com/jordansissel/fpm/issues/1667 @@ -170,6 +171,7 @@ .. _#1877: https://github.com/jordansissel/fpm/issues/1877 .. _#1879: https://github.com/jordansissel/fpm/issues/1879 .. _#187: https://github.com/jordansissel/fpm/issues/187 +.. _#1880: https://github.com/jordansissel/fpm/issues/1880 .. _#1882: https://github.com/jordansissel/fpm/issues/1882 .. _#1884: https://github.com/jordansissel/fpm/issues/1884 .. _#1886: https://github.com/jordansissel/fpm/issues/1886 @@ -205,14 +207,32 @@ .. _#1955: https://github.com/jordansissel/fpm/issues/1955 .. _#1959: https://github.com/jordansissel/fpm/issues/1959 .. _#196: https://github.com/jordansissel/fpm/issues/196 +.. _#1978: https://github.com/jordansissel/fpm/issues/1978 .. _#1981: https://github.com/jordansissel/fpm/issues/1981 .. _#1988: https://github.com/jordansissel/fpm/issues/1988 .. _#198: https://github.com/jordansissel/fpm/issues/198 +.. _#2009: https://github.com/jordansissel/fpm/issues/2009 .. _#202: https://github.com/jordansissel/fpm/issues/202 +.. _#2036: https://github.com/jordansissel/fpm/issues/2036 +.. _#2041: https://github.com/jordansissel/fpm/issues/2041 .. _#204: https://github.com/jordansissel/fpm/issues/204 +.. _#2053: https://github.com/jordansissel/fpm/issues/2053 .. _#205: https://github.com/jordansissel/fpm/issues/205 +.. _#2062: https://github.com/jordansissel/fpm/issues/2062 +.. _#2063: https://github.com/jordansissel/fpm/issues/2063 +.. _#2064: https://github.com/jordansissel/fpm/issues/2064 +.. _#2065: https://github.com/jordansissel/fpm/issues/2065 +.. _#2066: https://github.com/jordansissel/fpm/issues/2066 +.. _#2067: https://github.com/jordansissel/fpm/issues/2067 +.. _#2068: https://github.com/jordansissel/fpm/issues/2068 .. _#206: https://github.com/jordansissel/fpm/issues/206 +.. _#2072: https://github.com/jordansissel/fpm/issues/2072 +.. _#2074: https://github.com/jordansissel/fpm/issues/2074 +.. _#2076: https://github.com/jordansissel/fpm/issues/2076 .. _#207: https://github.com/jordansissel/fpm/issues/207 +.. _#2082: https://github.com/jordansissel/fpm/issues/2082 +.. _#2084: https://github.com/jordansissel/fpm/issues/2084 +.. _#2085: https://github.com/jordansissel/fpm/issues/2085 .. _#208: https://github.com/jordansissel/fpm/issues/208 .. _#212: https://github.com/jordansissel/fpm/issues/212 .. _#213: https://github.com/jordansissel/fpm/issues/213 diff --git a/docs/cli-reference.rst b/docs/cli-reference.rst index fd9676ad51..89d23e1dab 100644 --- a/docs/cli-reference.rst +++ b/docs/cli-reference.rst @@ -133,7 +133,10 @@ General Options - (deb only) Add FILEPATH as debian changelog * ``--deb-compression COMPRESSION`` - - (deb only) The compression type to use, must be one of gz, bzip2, xz, none. + - (deb only) The compression type to use, must be one of gz, bzip2, xz, zst, none. + +* ``--deb-compression-level [0-9]`` + - (deb only) Select a compression level. 0 is none or minimal. 9 is max compression. * ``--deb-config SCRIPTPATH`` - (deb only) Add SCRIPTPATH as debconf config file. @@ -204,6 +207,9 @@ General Options * ``--[no-]deb-systemd-enable`` - (deb only) Enable service on install or upgrade +* ``--deb-systemd-path FILEPATH`` + - (deb only) Relative path to the systemd service directory + * ``--[no-]deb-systemd-restart-after-upgrade`` - (deb only) Restart service after upgrade @@ -247,7 +253,7 @@ General Options - (freebsd only) Sets the FreeBSD 'origin' pkg field * ``--freebsd-osversion VERSION`` - - (freebsd only) Sets the FreeBSD 'version' pkg field, ie. 12 or 13, use '*' for all. + - (freebsd only) Sets the FreeBSD 'version' pkg field, ie 12 or 13, use '*' for all. * ``--gem-bin-path DIRECTORY`` - (gem only) The directory to install gem executables @@ -537,6 +543,9 @@ General Options * ``--[no-]rpm-macro-expansion`` - (rpm only) install-time macro expansion in %pre %post %preun %postun scripts (see: https://rpm.org/user_doc/scriptlet_expansion.html) +* ``--[no-]rpm-old-perl-dependency-name`` + - (rpm only) Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'. + * ``--rpm-os OS`` - (rpm only) The operating system to target this rpm for. You want to set this to 'linux' if you are using fpm on OS X, for example @@ -693,7 +702,9 @@ deb * ``--deb-changelog FILEPATH`` - Add FILEPATH as debian changelog * ``--deb-compression COMPRESSION`` - - The compression type to use, must be one of gz, bzip2, xz, none. + - The compression type to use, must be one of gz, bzip2, xz, zst, none. +* ``--deb-compression-level [0-9]`` + - Select a compression level. 0 is none or minimal. 9 is max compression. * ``--deb-config SCRIPTPATH`` - Add SCRIPTPATH as debconf config file. * ``--deb-custom-control FILEPATH`` @@ -740,6 +751,8 @@ deb - Start service after install or upgrade * ``--[no-]deb-systemd-enable`` - Enable service on install or upgrade +* ``--deb-systemd-path FILEPATH`` + - Relative path to the systemd service directory * ``--[no-]deb-systemd-restart-after-upgrade`` - Restart service after upgrade * ``--deb-templates FILEPATH`` @@ -768,9 +781,8 @@ freebsd * ``--freebsd-origin ABI`` - Sets the FreeBSD 'origin' pkg field - * ``--freebsd-osversion VERSION`` - - Sets the FreeBSD 'version' pkg field, ie. 12 or 13, use '*' for all. + - Sets the FreeBSD 'version' pkg field, ie 12 or 13, use '*' for all. gem --- @@ -983,6 +995,8 @@ rpm - Add FILEPATH as an init script * ``--[no-]rpm-macro-expansion`` - install-time macro expansion in %pre %post %preun %postun scripts (see: https://rpm.org/user_doc/scriptlet_expansion.html) +* ``--[no-]rpm-old-perl-dependency-name`` + - Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'. * ``--rpm-os OS`` - The operating system to target this rpm for. You want to set this to 'linux' if you are using fpm on OS X, for example * ``--rpm-posttrans FILE`` diff --git a/docs/packages/cli/deb.rst b/docs/packages/cli/deb.rst index a131b25a76..9f6b748a72 100644 --- a/docs/packages/cli/deb.rst +++ b/docs/packages/cli/deb.rst @@ -11,7 +11,9 @@ * ``--deb-changelog FILEPATH`` - Add FILEPATH as debian changelog * ``--deb-compression COMPRESSION`` - - The compression type to use, must be one of gz, bzip2, xz, none. + - The compression type to use, must be one of gz, bzip2, xz, zst, none. +* ``--deb-compression-level [0-9]`` + - Select a compression level. 0 is none or minimal. 9 is max compression. * ``--deb-config SCRIPTPATH`` - Add SCRIPTPATH as debconf config file. * ``--deb-custom-control FILEPATH`` @@ -58,6 +60,8 @@ - Start service after install or upgrade * ``--[no-]deb-systemd-enable`` - Enable service on install or upgrade +* ``--deb-systemd-path FILEPATH`` + - Relative path to the systemd service directory * ``--[no-]deb-systemd-restart-after-upgrade`` - Restart service after upgrade * ``--deb-templates FILEPATH`` diff --git a/docs/packages/cli/rpm.rst b/docs/packages/cli/rpm.rst index d34b040949..b6593d486f 100644 --- a/docs/packages/cli/rpm.rst +++ b/docs/packages/cli/rpm.rst @@ -36,6 +36,8 @@ - Add FILEPATH as an init script * ``--[no-]rpm-macro-expansion`` - install-time macro expansion in %pre %post %preun %postun scripts (see: https://rpm.org/user_doc/scriptlet_expansion.html) +* ``--[no-]rpm-old-perl-dependency-name`` + - Use older 'perl' depdency name. Newer Red Hat (and derivatives) use a dependency named 'perl-interpreter'. * ``--rpm-os OS`` - The operating system to target this rpm for. You want to set this to 'linux' if you are using fpm on OS X, for example * ``--rpm-posttrans FILE`` diff --git a/lib/fpm/version.rb b/lib/fpm/version.rb index fa9cb278e8..1bc8eda708 100644 --- a/lib/fpm/version.rb +++ b/lib/fpm/version.rb @@ -1,3 +1,3 @@ module FPM - VERSION = "1.15.1" + VERSION = "1.16.0" end