- builds

Changed files:
    rpm.spec -> 1.865

diff --git a/rpm.spec b/rpm.spec
index a630996922eac0791f4981e2702cf034665e98dd..464ff48b68c8c269b93da804db0ea865c1067095 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -8,6 +8,24 @@
 #   repackaging uses unchanged "immutable header" image from original rpm, also
 #   preserving payload format and compressor from original rpm, _not_ current settings
 # - TODO: add macros for some ppc, mipsel, alpha and sparc
+# - uppackaged list:
+#   /usr/lib/rpm/http.req
+#   /usr/lib/rpm/install-sh
+#   /usr/lib/rpm/mono-find-provides
+#   /usr/lib/rpm/mono-find-requires
+#   /usr/lib/rpm/osgideps.pl
+#   /usr/lib/rpm/perldeps.pl
+#   /usr/lib/rpm/rpm2cpio
+#   /usr/lib/rpm/symclash.py
+#   /usr/lib/rpm/symclash.sh
+#   /usr/lib/rpm/vcheck
+#   /usr/share/man/ja/man8/rpmcache.8.gz
+#   /usr/share/man/ja/man8/rpmgraph.8.gz
+#   /usr/share/man/man8/rpmcache.8.gz
+#   /usr/share/man/man8/rpmconstant.8.gz
+#   /usr/share/man/man8/rpmgraph.8.gz
+#   /usr/share/man/pl/man8/rpmcache.8.gz
+#   /usr/share/man/pl/man8/rpmgraph.8.gz
 #
 # Conditional build:
 %bcond_with    static          # build static rpm+rpmi
@@ -108,7 +126,7 @@ Patch26:    %{name}-notsc.patch
 Patch27:       %{name}-hack-norpmlibdep.patch
 
 Patch32:       %{name}-pld-autodep.patch
-Patch34:       %{name}-epoch0.patch
+#Patch34:      %{name}-epoch0.patch
 Patch35:       %{name}-perl_req-INC_dirs.patch
 Patch36:       %{name}-debuginfo.patch
 Patch37:       %{name}-doxygen_hack.patch
@@ -642,7 +660,7 @@ install %{SOURCE12} scripts/perl.prov
 %endif
 %patch27 -p1
 %patch32 -p1
-%patch34 -p1
+#%patch34 -p1 # %{epoch} 0 in rpm macros should do this
 %patch35 -p0
 %patch36 -p1
 %patch37 -p1
@@ -700,7 +718,7 @@ fi
        %{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
        --enable-shared \
        --enable-static \
-       %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_libdir}} \
+       %{?with_python:--with-python=%{py_ver} --with-python-lib-dir=%{py_sitedir}} \
        %{!?with_python:--without-python} \
        --with%{!?with_selinux:out}-selinux \
        --with-libelf \