|
|
@@ -488,6 +488,7 @@ Provides: OpenPKG
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man3/*
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpmpopt
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/rpmrc
|
|
|
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.la
|
|
|
rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/lib
|
|
|
for file in \
|
|
|
u_pkg.sh vpkg-provides.sh vpkg-provides2.sh rpmdiff.cgi rpmdiff \
|
|
|
@@ -499,6 +500,12 @@ Provides: OpenPKG
|
|
|
config.guess config.sub; do
|
|
|
rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$file
|
|
|
done
|
|
|
+
|
|
|
+ # post-adjust RPM installation (namespace-clean POPT inclusion)
|
|
|
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/libpopt.a \
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/lib/librpmpopt.a
|
|
|
+ mv $RPM_BUILD_ROOT%{l_prefix}/include/popt.h \
|
|
|
+ $RPM_BUILD_ROOT%{l_prefix}/include/rpm/popt.h
|
|
|
|
|
|
# replace symlinks with hardlinks
|
|
|
for entry in rpme:rpmi rpmt:rpmb rpmu:rpmi rpmv:rpmq; do
|
|
|
@@ -659,8 +666,8 @@ Provides: OpenPKG
|
|
|
%config %{l_prefix}/etc/openpkg/rpmrc
|
|
|
%{l_prefix}/etc/openpkg/openpkg.pgp
|
|
|
%dir %{l_prefix}/include
|
|
|
- %{l_prefix}/include/popt.h
|
|
|
%dir %{l_prefix}/include/rpm
|
|
|
+ %{l_prefix}/include/rpm/popt.h
|
|
|
%{l_prefix}/include/rpm/header.h
|
|
|
%{l_prefix}/include/rpm/misc.h
|
|
|
%{l_prefix}/include/rpm/rpmbuild.h
|
|
|
@@ -701,14 +708,10 @@ Provides: OpenPKG
|
|
|
%{l_prefix}/lib/openpkg/patch
|
|
|
%{l_prefix}/lib/openpkg/tar
|
|
|
%{l_prefix}/lib/openpkg/bash
|
|
|
- %{l_prefix}/lib/libpopt.a
|
|
|
- %{l_prefix}/lib/libpopt.la
|
|
|
+ %{l_prefix}/lib/librpmpopt.a
|
|
|
%{l_prefix}/lib/librpm.a
|
|
|
- %{l_prefix}/lib/librpm.la
|
|
|
%{l_prefix}/lib/librpmbuild.a
|
|
|
- %{l_prefix}/lib/librpmbuild.la
|
|
|
%{l_prefix}/lib/librpmio.a
|
|
|
- %{l_prefix}/lib/librpmio.la
|
|
|
%dir %{l_prefix}/libexec
|
|
|
%dir %{l_prefix}/man
|
|
|
%dir %{l_prefix}/man/man1
|
