|
Panu Matilainen |
c7a072 |
diff -up rpm-4.19.1.1/macros.in.nogpg rpm-4.19.1.1/macros.in
|
|
Panu Matilainen |
c7a072 |
--- rpm-4.19.1.1/macros.in.nogpg 2024-10-14 10:01:22.265773552 +0300
|
|
Panu Matilainen |
c7a072 |
+++ rpm-4.19.1.1/macros.in 2024-10-14 10:02:32.245317535 +0300
|
|
Panu Matilainen |
c7a072 |
@@ -30,7 +30,6 @@
|
|
Panu Matilainen |
c7a072 |
%__chown @__CHOWN@
|
|
Panu Matilainen |
c7a072 |
%__cp @__CP@
|
|
Panu Matilainen |
c7a072 |
%__file @__FILE@
|
|
Panu Matilainen |
c7a072 |
-%__gpg @__GPG@
|
|
Panu Matilainen |
c7a072 |
%__grep @__GREP@
|
|
Panu Matilainen |
c7a072 |
%__gzip @__GZIP@
|
|
Panu Matilainen |
c7a072 |
%__id @__ID@
|
|
Panu Matilainen |
c7a072 |
@@ -321,12 +320,6 @@ Supplements: (%{name} = %{version}-%{r
|
|
Panu Matilainen |
c7a072 |
# marked as %doc should be installed.
|
|
Panu Matilainen |
c7a072 |
#%_excludedocs
|
|
Panu Matilainen |
c7a072 |
|
|
Panu Matilainen |
c7a072 |
-# The signature to use and the location of configuration files for
|
|
Panu Matilainen |
c7a072 |
-# signing packages with GNU gpg.
|
|
Panu Matilainen |
c7a072 |
-#
|
|
Panu Matilainen |
c7a072 |
-#%_gpg_name
|
|
Panu Matilainen |
c7a072 |
-#%_gpg_path
|
|
Panu Matilainen |
c7a072 |
-
|
|
Panu Matilainen |
c7a072 |
# The port and machine name of an HTTP proxy host (used for FTP/HTTP).
|
|
Panu Matilainen |
c7a072 |
#
|
|
Panu Matilainen |
c7a072 |
#%_httpport
|
|
Panu Matilainen |
c7a072 |
@@ -595,10 +588,10 @@ Supplements: (%{name} = %{version}-%{r
|
|
Panu Matilainen |
c7a072 |
%_fileattrsdir %{_rpmconfigdir}/fileattrs
|
|
Panu Matilainen |
c7a072 |
|
|
Panu Matilainen |
c7a072 |
# This macro defines how much space (in bytes) in package should be
|
|
Panu Matilainen |
c7a072 |
-# reserved for gpg signatures during building of a package. If this space is
|
|
Panu Matilainen |
c7a072 |
-# big enough for gpg signatures to fit into it then signing of the packages is
|
|
Panu Matilainen |
c7a072 |
+# reserved for OpenPGP signatures during building of a package. If this space
|
|
Panu Matilainen |
c7a072 |
+# big enough for the signature to fit into it then signing of the packages is
|
|
Panu Matilainen |
c7a072 |
# very quick because it is not necessary to rewrite the whole package to make
|
|
Panu Matilainen |
c7a072 |
-# some space for gpg signatures.
|
|
Panu Matilainen |
c7a072 |
+# some space for the signature.
|
|
Panu Matilainen |
c7a072 |
%__gpg_reserved_space 4096
|
|
Panu Matilainen |
c7a072 |
|
|
Panu Matilainen |
c7a072 |
#==============================================================================
|
|
Panu Matilainen |
c7a072 |
@@ -613,20 +606,6 @@ Supplements: (%{name} = %{version}-%{r
|
|
Panu Matilainen |
c7a072 |
%_db_backend @DB_BACKEND@
|
|
Panu Matilainen |
c7a072 |
|
|
Panu Matilainen |
c7a072 |
#==============================================================================
|
|
Panu Matilainen |
c7a072 |
-# ---- GPG/PGP/PGP5 signature macros.
|
|
Panu Matilainen |
c7a072 |
-# Macro(s) to hold the arguments passed to GPG/PGP for package
|
|
Panu Matilainen |
c7a072 |
-# signing. Expansion result is parsed by popt, so be sure to use
|
|
Panu Matilainen |
c7a072 |
-# %{shescape} where needed.
|
|
Panu Matilainen |
c7a072 |
-#
|
|
Panu Matilainen |
c7a072 |
-%__gpg_sign_cmd %{shescape:%{__gpg}} \
|
|
Panu Matilainen |
c7a072 |
- gpg --no-verbose --no-armor --no-secmem-warning \
|
|
Panu Matilainen |
c7a072 |
- %{?_gpg_digest_algo:--digest-algo=%{_gpg_digest_algo}} \
|
|
Panu Matilainen |
c7a072 |
- %{?_gpg_sign_cmd_extra_args} \
|
|
Panu Matilainen |
c7a072 |
- %{?_gpg_name:-u %{shescape:%{_gpg_name}}} \
|
|
Panu Matilainen |
c7a072 |
- -sbo %{shescape:%{?__signature_filename}} \
|
|
Panu Matilainen |
c7a072 |
- %{?__plaintext_filename:-- %{shescape:%{__plaintext_filename}}}
|
|
Panu Matilainen |
c7a072 |
-
|
|
Panu Matilainen |
c7a072 |
-#==============================================================================
|
|
Panu Matilainen |
c7a072 |
# ---- Transaction macros.
|
|
Panu Matilainen |
c7a072 |
# Macro(s) used to parameterize transactions.
|
|
Panu Matilainen |
c7a072 |
#
|