|
12 | 12 | python build_rpm_docker.py |
13 | 13 |
|
14 | 14 | This script will generate the RPM package files and place them in the |
15 | | -rpmbuild/ directory. |
| 15 | +dist/rpmbuild/ directory. |
16 | 16 | """ |
17 | 17 |
|
18 | 18 | import os |
@@ -58,14 +58,14 @@ def build_rpm_with_docker(): |
58 | 58 | RPM_VERSION="{project['version'].replace("-dev", "~dev")}" |
59 | 59 |
|
60 | 60 | # Creates the standard directory structure required by rpmbuild |
61 | | - mkdir -p rpmbuild/{{BUILD,RPMS,SOURCES,SPECS,SRPMS}} |
62 | | - cp "$WHEEL_FILE" rpmbuild/SOURCES/ |
| 61 | + mkdir -p dist/rpmbuild/{{BUILD,RPMS,SOURCES,SPECS,SRPMS}} |
| 62 | + mv "$WHEEL_FILE" dist/rpmbuild/SOURCES/ |
63 | 63 |
|
64 | 64 | # Get the changelog date |
65 | 65 | CHANGELOG_DATE=$(date '+%a %b %d %Y') |
66 | 66 |
|
67 | 67 | # Generate spec file with correct deps |
68 | | - cat > rpmbuild/SPECS/{rpm_name}.spec << EOF |
| 68 | + cat > dist/rpmbuild/SPECS/{rpm_name}.spec << EOF |
69 | 69 | Name: {rpm_name} |
70 | 70 | Version: $RPM_VERSION |
71 | 71 | Release: 1%{{?dist}} |
@@ -98,21 +98,21 @@ def build_rpm_with_docker(): |
98 | 98 | EOF |
99 | 99 |
|
100 | 100 | # Build the RPM |
101 | | - rpmbuild --define "_topdir /workspace/rpmbuild" -bb rpmbuild/SPECS/{rpm_name}.spec |
| 101 | + rpmbuild --define "_topdir /workspace/dist/rpmbuild" -bb dist/rpmbuild/SPECS/{rpm_name}.spec |
102 | 102 |
|
103 | 103 | # Fix permissions for Windows host |
104 | | - chmod -R u+rwX rpmbuild |
| 104 | + chmod -R u+rwX dist/rpmbuild |
105 | 105 | """ |
106 | 106 | ] |
107 | 107 |
|
108 | 108 | try: |
109 | 109 | subprocess.run(docker_cmd, check=True) |
110 | 110 | # Verify the existance of the .rpm |
111 | | - rpm_file = next(Path('rpmbuild/RPMS/noarch').glob('*.rpm'), None) |
| 111 | + rpm_file = next(Path('dist/rpmbuild/RPMS/noarch').glob('*.rpm'), None) |
112 | 112 | if rpm_file: |
113 | 113 | print(f"\nSuccess! RPM built: {rpm_file}") |
114 | 114 | else: |
115 | | - print("Error: RPM not found in rpmbuild/RPMS/noarch/", file=sys.stderr) |
| 115 | + print("Error: RPM not found in dist/rpmbuild/RPMS/noarch/", file=sys.stderr) |
116 | 116 | sys.exit(1) |
117 | 117 | except subprocess.CalledProcessError as e: |
118 | 118 | print(f"Build failed: {e}", file=sys.stderr) |
|
0 commit comments