diff --git a/build/README.md.src b/build/README.md.src index 740e900..cbf395c 100644 --- a/build/README.md.src +++ b/build/README.md.src @@ -16,16 +16,16 @@ Feel free to create a new chapter and submit a PR! ---- ## How to... !heading -### Define Version, Release, etc. in another file, environment variable, etc. !heading -This is shown in most chapters, including [Importing a Pre-Existing File Tree](#importing-a-pre-existing-file-tree). +### Define key parameters elsewhere !heading +The techniques to define Version, Release, etc. in another file, environment variable, etc. are shown in most chapters, including [Importing a Pre-Existing File Tree](#importing-a-pre-existing-file-tree). As an alternative to using the `rpmbuild` command line's `--define` option, you can also pre-process the specfile using `sed`, `autotools`, etc. I've seen them all and done them all for various reasons. -### Call `rpmbuild` from a `Makefile` !heading +### Call rpmbuild from a Makefile !heading This is shown in most chapters, including [Git Branch or Tag in Release](#git-branch-or-tag-in-release). ### Disable debug packaging !heading While **not recommended**, because debug packages are very useful, this is shown in most chapters as well. -### Include Jenkins (or Any CI) Job Number in Release !heading +### Include Jenkins Job Number in Release !heading This is shown in the `git` chapter as [Jenkins Build Number in Release](#jenkins-build-number-in-release) ### Provide Older Versions of Libraries !heading diff --git a/quick_tips/README.md b/quick_tips/README.md index dace79f..caceaa5 100644 --- a/quick_tips/README.md +++ b/quick_tips/README.md @@ -1,8 +1,8 @@ ## Quick Tips !heading In reviewing some of the most highly voted answers on Stack Overflow, I decided to gather a few here that don't require a full example to explain: -### Don't Put Single % In Comments !heading -This happens [a](https://stackoverflow.com/a/14063974/836748) [*lot*](https://stackoverflow.com/a/18440679/836748). You need to double it with `%%`, or a multi-line macro will only have the first line commented out! +### RPM Preprocessor is Really Dumb !heading +**Don't** put single `%` in comments... this happens [a](https://stackoverflow.com/a/14063974/836748) [*lot*](https://stackoverflow.com/a/18440679/836748). You need to double it with `%%`, or a multi-line macro will only have the first line commented out! Newer versions of `rpmbuild` will _at least_ warn you now. ### Extract All Files !heading Use `rpm2cpio` with `cpio`. This will extract all files treating the current directory as `/`: @@ -18,7 +18,7 @@ $ rpm2cpio package-3.8.3.rpm | cpio -iv --to-stdout ./usr/share/doc/package-3.8. 2173 blocks ``` -### Change (or No) Compression !heading +### Change Compression or No Compression !heading As noted [here](https://stackoverflow.com/a/10255406/836748): ```rpm-spec %define _source_payload w0.gzdio