[packages/rpm] - python module is built in-tree now, we just need to build the cache

baggins baggins at pld-linux.org
Mon Nov 25 23:30:54 CET 2024


commit a60f8b8e27da050bc69481c71c1524e61fc7be21
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 25 23:30:07 2024 +0100

    - python module is built in-tree now, we just need to build the cache

 rpm.spec | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index a24930b..b6aaabd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -662,11 +662,6 @@ cd build-cmake
 
 %{__make}
 
-#if %{with python3}
-#cd python
-#py3_build
-#%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/bin,/%{_lib},/etc/sysconfig,%{_sysconfdir}/{rpm,pki/rpm-gpg}} \
@@ -777,15 +772,9 @@ for be in sqlite bdb ndb; do
 	cp -va ${be}/. $RPM_BUILD_ROOT/var/lib/rpm/
 done
 
-#%if %{with python3}
-## Remove anything that rpm make install might put there;
-## we already have .egg-info as directory, so there is no reason for transition to file for a while
-#cd python
-#{__rm} -rf rpm.egg-info
-#{__rm} -rf $RPM_BUILD_ROOT%{py3_sitedir}
-#py3_install
-#cd ..
-#%endif
+%if %{with python3}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
+%endif
 
 # wrong location, not used anyway
 %{__rm} $RPM_BUILD_ROOT%{_rpmlibdir}/rpm.{daily,log}
@@ -1005,7 +994,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{py3_sitedir}/rpm/*.so
 %{py3_sitedir}/rpm/*.py
 %{py3_sitedir}/rpm-%{version}-py*.egg-info
-#%{py3_sitedir}/rpm/__pycache__
+%{py3_sitedir}/rpm/__pycache__
 %endif
 
 %if %{with plugins}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/a60f8b8e27da050bc69481c71c1524e61fc7be21



More information about the pld-cvs-commit mailing list