new file mode 100644

@@ -0,0 +1,19 @@

+#!/bin/sh

+# If using normal root, avoid changing anything.

+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then

+	exit 0

+fi

+

+STRIP=${1:-strip}

+

+case `uname -a` in

+Darwin*) exit 0 ;;

+*) ;;

+esac

+

+# Strip ELF binaries

+for f in `find "$RPM_BUILD_ROOT" -type f -exec file {} \; | \

+        grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \

+	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do

+	$STRIP --strip-debug -g "$f" || :

+done

new file mode 100644

@@ -0,0 +1,19 @@

+#!/bin/sh

+# If using normal root, avoid changing anything.

+if [ -z "$RPM_BUILD_ROOT" -o "$RPM_BUILD_ROOT" = "/" ]; then

+	exit 0

+fi

+

+STRIP=${1:-strip}

+

+case `uname -a` in

+Darwin*) exit 0 ;;

+*) ;;

+esac

+

+# Strip ELF binaries

+for f in `find "$RPM_BUILD_ROOT" -type f -exec file {} \; | \

+        grep -v "^${RPM_BUILD_ROOT}/\?usr/lib/debug"  | \

+	sed -n -e 's/^\(.*\):[ 	]*ELF.*, not stripped/\1/p'`; do

+	$STRIP --strip-unneeded -g "$f" || :

+done

new file mode 100644

@@ -0,0 +1,16 @@

+diff -Naur a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh

+--- a/scripts/find-debuginfo.sh	2012-11-07 04:55:24.000000000 -0800

+@@ -217,8 +217,10 @@

+     eval linked=\$linked_$inum

+     if [ -n "$linked" ]; then

+       eval id=\$linkedid_$inum

+-      make_id_dup_link "$id" "$dn/$(basename $f)"

+-      make_id_dup_link "$id" "/usr/lib/debug$dn/$bn" .debug

++      if [ -n "$id" ]; then

++        make_id_dup_link "$id" "$dn/$(basename $f)"

++        make_id_dup_link "$id" "/usr/lib/debug$dn/$bn" .debug

++      fi

+       link=$debugfn

+       get_debugfn "$linked"

+       echo "hard linked $link to $debugfn"

new file mode 100644

@@ -0,0 +1,50 @@

+#

+#	System settings

+#

+%_topdir		/usr/src/photon

+#

+#	Build flags

+#

+#%_optflags_i686	-march=i486 -mtune=i686 -O2 -pipe

+#%_optflags_x86_64	-march=x86-64 -mtune=generic -O2 -pipe -fno-strict-aliasing

+#

+#	Some standard locations

+#

+%_sysconfdir		/etc

+%_lib			/usr/lib

+%_lib64			/usr/lib64

+%_prefix		/usr

+%_exec_prefix		/usr

+%_bindir		/usr/bin

+%_sbindir		/usr/sbin

+%_libdir		/usr/lib

+%_lib64dir		/usr/lib64

+%_libexecdir		/usr/libexec

+%_datadir		/usr/share

+%_docdir		/usr/share/doc

+%_includedir		/usr/include

+%_infodir		/usr/share/info

+%_mandir		/usr/share/man

+%_oldincludedir		/usr/include

+%_sharedstatedir	/var/lib

+%_var			/var

+%_localstatedir		/var

+

+%__tar			/bin/tar --no-same-owner

+

+%_enable_debug_packages 1

+%_include_minidebuginfo 1

+%_use_internal_dependency_generator 1

+

+%__os_install_post    \

+    %{_rpmconfigdir}/brp-compress \

+    %{_rpmconfigdir}/brp-strip %{__strip} \

+    %{_rpmconfigdir}/brp-strip-debug-symbols %{__strip} \

+    %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \

+    %{_rpmconfigdir}/brp-strip-unneeded %{__strip} \

+    %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \

+%{nil}

+

+%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\

+%%install\

+%{nil}

deleted file mode 100644

@@ -1,11 +0,0 @@

-+++ b/macros.in 2016-05-25 22:58:23.639372839 +0000

-@@ -197,6 +197,8 @@

- package or when debugging this package.\

- %files debuginfo -f debugfiles.list\

- %defattr(-,root,root)\

-+%exclude %{_libdir}/debug/.build-id/.1\

-+%exclude %{_libdir}/debug/.build-id/.1.debug\

- %endif\

- %{nil}

- 

@@ -1,7 +1,7 @@

 Summary:          Package manager

 Name:              rpm

 Version:          4.11.2

-Release:          10%{?dist}

+Release:          11%{?dist}

 License:          GPLv2+

 URL:              http://rpm.org

 Group:            Applications/System

@@ -11,9 +11,10 @@ Source0:          http://rpm.org/releases/rpm-4.11.x/%{name}-%{version}.tar.bz2

 %define sha1 rpm-4.11.2=ceef44bd180d48d4004c437bc31a3ea038f54e3e

 Source1:          http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz

 %define sha1 db=fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9

-Source2:          rpm-system-configuring-scripts-2.2.tar.gz

-%define sha1 rpm-system-configuring-scripts=9461cdc0b65f7ecc244bfa09886b4123e55ab5a8

-Patch0:		  rpm-debuginfo-exclude.1.patch

+Source2:          macros

+Source3:          brp-strip-debug-symbols

+Source4:          brp-strip-unneeded

+Patch0:		  find-debuginfo-do-not-generate-non-existing-build-id.patch

 #Requires:        nspr

 Requires:         nss 

 Requires:         popt

@@ -54,10 +55,9 @@ Binaries, libraries and scripts to build rpms.

 %prep

 %setup -q

+%patch0 -p1

 %setup -q -T -D -a 1

-%setup -q -T -D -a 2

 mv db-5.3.28 db

-%patch0 -p1

 %build

 ./autogen.sh --noconfigure

 ./configure \

@@ -89,11 +89,9 @@ find %{buildroot} -name '*.la' -delete

 %find_lang %{name}

 # System macros and prefix

 install -dm 755 %{buildroot}%{_sysconfdir}/rpm

-pushd rpm-system-configuring-scripts

-install -vm644 macros %{buildroot}%{_sysconfdir}/rpm/

-install -vm755 brp-strip-debug-symbols %{buildroot}%{_libdir}/rpm/

-install -vm755 brp-strip-unneeded %{buildroot}%{_libdir}/rpm/

-popd

+install -vm644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rpm/

+install -vm755 %{SOURCE3} %{buildroot}%{_libdir}/rpm/

+install -vm755 %{SOURCE4} %{buildroot}%{_libdir}/rpm/

 %post -p /sbin/ldconfig

 %postun -p /sbin/ldconfig

 %clean

@@ -199,10 +197,13 @@ rm -rf %{buildroot}

 %{_libdir}/librpmsign.so.*

 %changelog

+*    Fri Aug 26 2016 Alexey Makhalov <amakhalov@vmware.com> 4.11.2-11

+-    find-debuginfo...patch: exclude non existing .build-id from packaging

+-    Move all files from rpm-system-configuring-scripts tarball to here 

 *    Wed May 25 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.11.2-10

 -    Exclude .build-id/.1 and .build-id/.1.debug from debuginfo pkg

-*	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.11.2-9

--	GA - Bump release of all rpms

+*    Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.11.2-9

+-    GA - Bump release of all rpms

 *    Thu May 05 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 4.11.2-8

 -    Update rpm version in lock-step with lua update to 5.3.2

 *    Fri Apr 08 2016 Mahmoud Bassiouny <mbassiouny@vmware.com> 4.11.2-7