pool/rpm
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 745538 from home:Pharaoh_Atem:branches:Base:System

Browse Source 
- Fix shebang for pythondistdeps.py to use Python 3
  + Modify patch: pythondistdeps.diff
- Move pythondistdeps dependency generator to rpm-build
- Add python3-setuptools and python3 dependencies to rpm-build for pythondistdeps

OBS-URL: https://build.opensuse.org/request/show/745538
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=512
This commit is contained in:
Richard Brown 2019-11-08 15:07:03 +00:00 committed by Git OBS Bridge
parent 4dfb67a342
commit fcf6ee76aa
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pythondistdeps.diff
View File

@ -1,7 +1,8 @@
--- ./scripts/pythondistdeps.py.orig 2018-08-08 13:40:18.173941320 +0000 --- ./scripts/pythondistdeps.py.orig 2019-06-26 10:17:31.454985631 -0400
+++ ./scripts/pythondistdeps.py 2018-10-16 09:30:49.271004917 +0000 +++ ./scripts/pythondistdeps.py 2019-10-31 16:30:37.685850605 -0400
@@ -1,4 +1,3 @@ @@ -1,4 +1,4 @@
-#!/usr/bin/python -#!/usr/bin/python
+#!/usr/bin/python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# Copyright 2010 Per Øyvind Karlsen <proyvind@moondrake.org> # Copyright 2010 Per Øyvind Karlsen <proyvind@moondrake.org>

8
rpm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 5 16:25:53 UTC 2019 - Neal Gompa <ngompa13@gmail.com>
- Fix shebang for pythondistdeps.py to use Python 3
+ Modify patch: pythondistdeps.diff
- Move pythondistdeps dependency generator to rpm-build
- Add python3-setuptools and python3 dependencies to rpm-build for pythondistdeps
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 15 02:52:18 UTC 2019 - Neal Gompa <ngompa13@gmail.com> Tue Oct 15 02:52:18 UTC 2019 - Neal Gompa <ngompa13@gmail.com>

9
rpm.spec
View File

@ -201,6 +201,11 @@ Requires: xz
# drop candidates # drop candidates
Requires: cpio Requires: cpio
Requires: file Requires: file
# for pythondistdeps generator
Requires: python3
Requires: python3-setuptools
# The point of the split
Conflicts: rpm < 4.15.0
%description build %description build
If you want to build a rpm, you need this package. It provides rpmbuild If you want to build a rpm, you need this package. It provides rpmbuild
@ -414,6 +419,8 @@ fi
%exclude /usr/lib/rpm/brp-* %exclude /usr/lib/rpm/brp-*
%exclude /usr/lib/rpm/check-* %exclude /usr/lib/rpm/check-*
%exclude /usr/lib/rpm/*find* %exclude /usr/lib/rpm/*find*
%exclude /usr/lib/rpm/fileattrs/pythondist.attr
%exclude /usr/lib/rpm/pythondistdeps.py
/usr/sbin/rpmconfigcheck /usr/sbin/rpmconfigcheck
/usr/lib/systemd/system/rpmconfigcheck.service /usr/lib/systemd/system/rpmconfigcheck.service
/usr/lib/rpm /usr/lib/rpm
@ -451,6 +458,8 @@ fi
/usr/lib/rpm/brp-* /usr/lib/rpm/brp-*
/usr/lib/rpm/check-* /usr/lib/rpm/check-*
/usr/lib/rpm/*find* /usr/lib/rpm/*find*
/usr/lib/rpm/fileattrs/pythondist.attr
/usr/lib/rpm/pythondistdeps.py
%files devel %files devel
%defattr(644,root,root,755) %defattr(644,root,root,755)