branch: elpa/rpm-spec-mode
commit c20a6f0160a1272a579392b329c0e1eed5f937e7
Merge: c69847de7a 582463111a
Author: Björn Bidar <bjorn.bi...@thaodan.de>
Commit: Björn Bidar <bjorn.bi...@thaodan.de>
Merge RPM 4.20 changes into thaodan/personal_merger [#3]
---
rpm-spec-mode.el | 96 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 78 insertions(+), 18 deletions(-)
diff --git a/rpm-spec-mode.el b/rpm-spec-mode.el
index d36c92df3c..681e781d4c 100644
--- a/rpm-spec-mode.el
+++ b/rpm-spec-mode.el
@@ -241,32 +241,87 @@ value returned by function `user-mail-address'."
;; variables used by navigation functions.
(defconst rpm-sections
- '("preamble" "description" "prep" "setup" "build" "install" "check" "clean"
- "changelog" "files")
+ '("preamble"
+ "description"
+ "prep"
+ "generate_buildrequires"
+ "conf"
+ "build"
+ "install"
+ "check"
+ "clean"
+ "files"
+ "changelog")
"Partial list of section names.")
(defconst rpm-scripts
;; trigger, filetrigger, transfiletrigger no found in build/parseScript.c
- '("pre" "post" "preun" "postun"
- "trigger" "triggerin" "triggerprein" "triggerun" "triggerpostun"
- "pretrans" "posttrans" "verifyscript" "filetriggerin" "filetrigger"
- "filetriggerun" "filetriggerpostun" "transfiletriggerin" "transfiletrigger"
- "transfiletriggerun" "transfiletriggerun" "transfiletriggerpostun")
+ '("pre"
+ "post"
+ "preun"
+ "postun"
+ "trigger"
+ "triggerin"
+ "triggerprein"
+ "triggerun"
+ "triggerpostun"
+ "pretrans"
+ "posttrans"
+ "preuntrans"
+ "postuntrans"
+ "verifyscript"
+ "filetriggerin"
+ "filetrigger"
+ "filetriggerun"
+ "filetriggerpostun"
+ "transfiletriggerin"
+ "transfiletrigger"
+ "transfiletriggerun"
+ "transfiletriggerpostun")
"List of rpm scripts.")
(defconst rpm-section-seperate "^%\\(\\w+\\)\\s-")
(defconst rpm-section-regexp
(eval-when-compile
(concat "^%"
(regexp-opt
- ;; From RPM 4.16.1.3 sources, file build/parseSpec.c: partList[].
- '("package" "prep" "generate_buildrequires" "build" "install"
- "check" "clean" "preun" "postun" "pretrans" "posttrans"
- "pre" "post" "files" "changelog" "description"
- "triggerpostun" "triggerprein" "triggerun" "triggerin"
- "trigger" "verifyscript" "sepolicy" "filetriggerin"
- "filetrigger" "filetriggerun" "filetriggerpostun"
- "transfiletriggerin" "transfiletrigger" "transfiletriggerun"
- "transfiletriggerun" "transfiletriggerpostun" "end"
- "patchlist" "sourcelist") t)
+ ;; From RPM 4.20.0 sources, file build/parseSpec.c: partList[].
+ '("package"
+ "prep"
+ "generate_buildrequires"
+ "conf"
+ "build"
+ "install"
+ "check"
+ "clean"
+ "preun"
+ "postun"
+ "pretrans"
+ "posttrans"
+ "preuntrans"
+ "postuntrans"
+ "pre"
+ "post"
+ "files"
+ "changelog"
+ "description"
+ "triggerpostun"
+ "triggerprein"
+ "triggerun"
+ "triggerin"
+ "trigger"
+ "verifyscript"
+ "sepolicy"
+ "filetriggerin"
+ "filetrigger"
+ "filetriggerun"
+ "filetriggerpostun"
+ "transfiletriggerin"
+ "transfiletrigger"
+ "transfiletriggerun"
+ "transfiletriggerpostun"
+ "end"
+ "patchlist"
+ "sourcelist")
+ t)
"\\b"))
"Regular expression to match beginning of a section.")
@@ -350,13 +405,14 @@ value returned by function `user-mail-address'."
(defvar rpm-spec-nobuild-option "--nobuild" "Option for no build.")
(defvar rpm-tags-list
- ;; From RPM 4.16.1.3 sources, file build/parsePreamble.c: preambleList[]:
+ ;; From RPM 4.20.0 sources, file build/parsePreamble.c: preambleList[]:
'(("Name")
("Version")
("Release")
("Epoch")
("Summary")
("License")
+ ("SourceLicense")
("Distribution")
("DistURL")
("Vendor")
@@ -388,14 +444,18 @@ value returned by function `user-mail-address'."
("BuildArchitectures")
("BuildArch")
("BuildConflicts")
+ ("BuildOption")
("BuildPreReq")
("BuildRequires")
+ ("BuildSystem")
("AutoReqProv")
("AutoReq")
("AutoProv")
("DocDir")
("DistTag")
("BugURL")
+ ("TranslationURL")
+ ("UpstreamReleases")
("OrderWithRequires")
("RemovePathPostFixes")
("ModularityLabel")
