Ver código fonte

keep RPM C API available for add-on packages

Ralf S. Engelschall 24 anos atrás
pai
commit
06224bb5ac
2 arquivos alterados com 25 adições e 6 exclusões
  1. 1 1
      openpkg/openpkg.boot
  2. 24 5
      openpkg/openpkg.spec

+ 1 - 1
openpkg/openpkg.boot

@@ -402,7 +402,7 @@ $tmpdir/rpm -bb $spec
 ##
 
 echo "++ overwriting RPM installation by installing via RPM itself"
-$tmpdir/rpm -Uvh --force --noscripts --justdb --ignoresize \
+$tmpdir/rpm -Uvh --force --noscripts --notriggers --justdb --ignoresize \
     $RPM_BUILD_ROOT$prefix/RPM/PKG/openpkg-*.rpm
 
 ##  Puhhhh!!! what a tricky bootstrapping procedure. But now we are

+ 24 - 5
openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020312
-%define       R_openpkg 20020312
+%define       V_openpkg 20020327
+%define       R_openpkg 20020327
 
 #   the used software versions
 %define       V_rpm     4.0.2
@@ -456,9 +456,6 @@ 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*
-    rm -f $RPM_BUILD_ROOT%{l_prefix}/include/popt.h
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/rpm
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/var/lib
     for file in \
         u_pkg.sh vpkg-provides.sh vpkg-provides2.sh rpmdiff.cgi rpmdiff \
@@ -623,6 +620,20 @@ Provides:     OpenPKG
     %config %{l_prefix}/etc/openpkg/rpmrc
     %{l_prefix}/etc/openpkg/openpkg.pgp
     %dir %{l_prefix}/include
+    %{l_prefix}/include/popt.h
+    %{l_prefix}/include/rpm/header.h
+    %{l_prefix}/include/rpm/misc.h
+    %{l_prefix}/include/rpm/rpmbuild.h
+    %{l_prefix}/include/rpm/rpmerr.h
+    %{l_prefix}/include/rpm/rpmio.h
+    %{l_prefix}/include/rpm/rpmlib.h
+    %{l_prefix}/include/rpm/rpmlog.h
+    %{l_prefix}/include/rpm/rpmmacro.h
+    %{l_prefix}/include/rpm/rpmmessages.h
+    %{l_prefix}/include/rpm/rpmspec.h
+    %{l_prefix}/include/rpm/rpmurl.h
+    %{l_prefix}/include/rpm/stringbuf.h
+    %{l_prefix}/include/rpm/ugid.h
     %dir %{l_prefix}/info
     %dir %{l_prefix}/lib
     %dir %{l_prefix}/lib/openpkg
@@ -649,6 +660,14 @@ 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/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