Skip to content

Commit 2ac8ace

Browse files
committed
update upstream release documentation
1 parent 5e08d35 commit 2ac8ace

File tree

5 files changed

+99
-20
lines changed

5 files changed

+99
-20
lines changed

release_tools/README.adoc

+6-7
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ NOTE: As of July-20th 2019, it takes about 44 minutes for all the builds finish.
8383

8484
While Jenkins performs the builds you can generate and review the release notes:
8585

86-
* Run `python3 release_content.py release-notes`
86+
* Run `python3 release_content.py release_notes`
8787

8888
Format of the release notes are as follows: +
8989
At the top Highlighted PRs will be listed, followed by list of product's profiles that changed since last release. +
@@ -127,12 +127,11 @@ It will also create a `bump_version_{version}` branch and a "Bump version" commi
127127

128128
=== Copr builds ===
129129
* Move to the directory where you did the latest Fedora build.
130-
* Create a srpm with `fedpkg srpm`. This srpm will be used for epel-8 builds, rename it appropriately.
131-
* Copy the `copr_packages.patch` from the directory where this readme is placed into the directory where the spec file is.
132-
* Apply the patch with `patch -p1 < copr_packages.patch`
133-
* Create another srpm with `fedpkg srpm` and name it appropriately. This srpm will be used for epel-6 and epel-7 builds.
134-
* Upload both SRPMs into publicly visible folder in your `fedorapeople.org` space.
130+
* Copy `copr_epel8.patch`, `copr_epel7.patch` and `copr_epel6.patch` from the directory where this readme is placed into the directory where the spec file is.
131+
* For epel8, apply the patch with `patch -p1 < copr_epel8.patch` and rename the patched file appropriately.
132+
* Upload the new spec file into publicly visible folder in your `fedorapeople.org` space.
133+
* Patch and upload spec files for epel7 and epel6 in similar way as shown above.
135134
* Use your Fedora account and login into link:https://copr.fedorainfracloud.org/coprs/openscapmaint/openscap-latest/[COPR repo].
136135
* Verify that you have build permissions through settings -> permissions.
137136
* If you don't have build permissions, you can ask for them directly from the interface. Wait for one of administrators to confirm.
138-
* Make new builds. One for epel-6 and epel-7, one for epel-8 only. Use URLs pointing to SRPMs which you have just uploaded.
137+
* Make new builds. Use URLs to spec files which you previously uploaded to your folder at fedorapeople.org. Use respective spec files for respective epels.

release_tools/copr_epel6.patch

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
--- scap-security-guide.spec 2020-09-25 11:49:18.257916790 +0200
2+
+++ scap-security-guide_epel6.spec 2020-09-25 11:56:28.165456729 +0200
3+
@@ -11,9 +11,10 @@
4+
BuildRequires: expat
5+
BuildRequires: openscap-scanner >= 1.2.5
6+
BuildRequires: cmake >= 2.8
7+
-BuildRequires: python%{python3_pkgversion}
8+
-BuildRequires: python%{python3_pkgversion}-jinja2
9+
-BuildRequires: python%{python3_pkgversion}-PyYAML
10+
+BuildRequires: python2
11+
+BuildRequires: python-jinja2
12+
+BuildRequires: PyYAML
13+
+BuildRequires: python-argparse
14+
Requires: xml-common, openscap-scanner >= 1.2.5
15+
Obsoletes: openscap-content < 0:0.9.13
16+
Provides: openscap-content
17+
@@ -41,13 +42,16 @@
18+
19+
%prep
20+
%setup -q
21+
+mkdir build
22+
23+
%build
24+
-%cmake
25+
-%cmake_build
26+
+cd build
27+
+%cmake ..
28+
+%make_build
29+
30+
%install
31+
-%cmake_install
32+
+cd build
33+
+%make_install
34+
35+
%files
36+
%{_datadir}/xml/scap/ssg/content

release_tools/copr_epel7.patch

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
--- scap-security-guide.spec 2020-09-25 11:49:18.257916790 +0200
2+
+++ scap-security-guide_epel7.spec 2020-09-25 11:49:45.951338075 +0200
3+
@@ -11,9 +11,9 @@
4+
BuildRequires: expat
5+
BuildRequires: openscap-scanner >= 1.2.5
6+
BuildRequires: cmake >= 2.8
7+
-BuildRequires: python%{python3_pkgversion}
8+
-BuildRequires: python%{python3_pkgversion}-jinja2
9+
-BuildRequires: python%{python3_pkgversion}-PyYAML
10+
+BuildRequires: python3
11+
+BuildRequires: python-jinja2
12+
+BuildRequires: PyYAML
13+
Requires: xml-common, openscap-scanner >= 1.2.5
14+
Obsoletes: openscap-content < 0:0.9.13
15+
Provides: openscap-content
16+
@@ -41,13 +41,16 @@
17+
18+
%prep
19+
%setup -q
20+
+mkdir build
21+
22+
%build
23+
-%cmake
24+
-%cmake_build
25+
+cd build
26+
+%cmake ..
27+
+%make_build
28+
29+
%install
30+
-%cmake_install
31+
+cd build
32+
+%make_install
33+
34+
%files
35+
%{_datadir}/xml/scap/ssg/content

release_tools/copr_epel8.patch

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
--- scap-security-guide.spec 2020-09-25 11:49:18.257916790 +0200
2+
+++ scap-security-guide_epel8.spec 2020-09-25 11:50:11.097720611 +0200
3+
@@ -41,13 +41,16 @@
4+
5+
%prep
6+
%setup -q
7+
+mkdir build
8+
9+
%build
10+
-%cmake
11+
-%cmake_build
12+
+cd build
13+
+%cmake ..
14+
+%make_build
15+
16+
%install
17+
-%cmake_install
18+
+cd build
19+
+%make_install
20+
21+
%files
22+
%{_datadir}/xml/scap/ssg/content

release_tools/copr_packages.patch

-13
This file was deleted.

0 commit comments

Comments
 (0)