tizen 2.4 releasetizen_2.4_mobile_releasesubmit/tizen_2.4_base/20151026.091542accepted/tizen/2.4/base/20151026.115341tizen_2.4_baseaccepted/tizen_2.4_base

43 files changed, 73 insertions, 32 deletions

diff --git a/packaging/Makefile b/packaging/Makefile
index f1f6486..f1f6486 100644..100755
--- a/packaging/Makefile
+++ b/packaging/Makefile
diff --git a/packaging/autodeps.diff b/packaging/autodeps.diff
index bbe7715..bbe7715 100644..100755
--- a/packaging/autodeps.diff
+++ b/packaging/autodeps.diff
diff --git a/packaging/beecrypt-4.1.2.diff b/packaging/beecrypt-4.1.2.diff
index 6f9c261..6f9c261 100644..100755
--- a/packaging/beecrypt-4.1.2.diff
+++ b/packaging/beecrypt-4.1.2.diff
diff --git a/packaging/beecrypt-4.1.2.tar.bz2 b/packaging/beecrypt-4.1.2.tar.bz2
index 4a839bc..4a839bc 100644..100755
--- a/packaging/beecrypt-4.1.2.tar.bz2
+++ b/packaging/beecrypt-4.1.2.tar.bz2
diff --git a/packaging/build_pack_4.9.1_fix.patch b/packaging/build_pack_4.9.1_fix.patch
index 15eac53..15eac53 100644..100755
--- a/packaging/build_pack_4.9.1_fix.patch
+++ b/packaging/build_pack_4.9.1_fix.patch
diff --git a/packaging/buildidprov.diff b/packaging/buildidprov.diff
index 6674d50..6674d50 100644..100755
--- a/packaging/buildidprov.diff
+++ b/packaging/buildidprov.diff
diff --git a/packaging/db-4.8.30.tar.gz b/packaging/db-4.8.30.tar.gz
index 21a743f..21a743f 100644..100755
--- a/packaging/db-4.8.30.tar.gz
+++ b/packaging/db-4.8.30.tar.gz
diff --git a/packaging/db.diff b/packaging/db.diff
index dbfb293..dbfb293 100644..100755
--- a/packaging/db.diff
+++ b/packaging/db.diff
diff --git a/packaging/debugsource-package.diff b/packaging/debugsource-package.diff
index 998d9c4..998d9c4 100644..100755
--- a/packaging/debugsource-package.diff
+++ b/packaging/debugsource-package.diff
diff --git a/packaging/debugsubpkg.diff b/packaging/debugsubpkg.diff
index 3545fdb..3545fdb 100644..100755
--- a/packaging/debugsubpkg.diff
+++ b/packaging/debugsubpkg.diff
diff --git a/packaging/device-sec-policy b/packaging/device-sec-policy
index 626b905..626b905 100644..100755
--- a/packaging/device-sec-policy
+++ b/packaging/device-sec-policy
diff --git a/packaging/fileattrs.diff b/packaging/fileattrs.diff
index 9b616ae..9b616ae 100644..100755
--- a/packaging/fileattrs.diff
+++ b/packaging/fileattrs.diff
diff --git a/packaging/find-docs.sh b/packaging/find-docs.sh
index c1dd130..c1dd130 100644..100755
--- a/packaging/find-docs.sh
+++ b/packaging/find-docs.sh
diff --git a/packaging/finddebuginfo.diff b/packaging/finddebuginfo.diff
index e3bf4d5..e3bf4d5 100644..100755
--- a/packaging/finddebuginfo.diff
+++ b/packaging/finddebuginfo.diff
diff --git a/packaging/firmware.diff b/packaging/firmware.diff
index aa35bb3..aa35bb3 100644..100755
--- a/packaging/firmware.diff
+++ b/packaging/firmware.diff
diff --git a/packaging/fontprovides.diff b/packaging/fontprovides.diff
index a8ceade..a8ceade 100644..100755
--- a/packaging/fontprovides.diff
+++ b/packaging/fontprovides.diff
diff --git a/packaging/lib_rpmdb_4.9.1_fix.patch b/packaging/lib_rpmdb_4.9.1_fix.patch
index 4d151b4..4d151b4 100644..100755
--- a/packaging/lib_rpmdb_4.9.1_fix.patch
+++ b/packaging/lib_rpmdb_4.9.1_fix.patch
diff --git a/packaging/libsymlink.attr b/packaging/libsymlink.attr
index 8bb6404..8bb6404 100644..100755
--- a/packaging/libsymlink.attr
+++ b/packaging/libsymlink.attr
diff --git a/packaging/macros b/packaging/macros
index 4bf2d1a..79c6d7f 100644
--- a/packaging/macros
+++ b/packaging/macros
@@ -13,8 +13,11 @@
 %_default_patch_fuzz    2
 %_enable_debug_packages 1
 
-#==============================================================================
-# ---- configure and makeinstall.
+%do_profiling 1
+%cflags_profile_generate -fprofile-generate
+%cflags_profile_feedback -fprofile-use
+
+# Tizen
 #
 %configure \
   CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
@@ -99,6 +102,7 @@
 	infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
   install
 
+
 %make_install \
   %{__make} \\\
 	DESTDIR=%{?buildroot:%{buildroot}} \\\
@@ -158,14 +162,15 @@
 %{nil}
 
 
-%lang_package \
-%package locale \
+%lang_package(n:f:) \
+%package %{-n:-n %{-n*}-}locale \
 Summary: Translations and Locale for package %{name}\
-Group: Translations\
-AutoReqProv: 0\
-%description locale\
+Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
+Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
+BuildArch:  noarch \
+%description %{-n:-n %{-n*}-}locale\
 This package provides translations for package %{name}.\
-%files locale -f %{name}.lang\
+%files %{-n:-n %{-n*}-}locale -f %{-f:%{-f*}.lang} %{!-f:%{name}.lang}\
 %defattr(-,root,root,-)\
 %{nil}
 
@@ -236,7 +241,7 @@ rm -rf %{?buildroot:%{buildroot}} \
 # Should unpackaged files in a build root terminate a build?
 %_unpackaged_files_terminate_build    1
 
-%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Wl,--as-needed
+%__global_cflags	-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -Wformat-security -Wl,--as-needed -Wl,-O1 -Wl,--hash-style=gnu
 
 # Disable lookups
 %_hkp_keyserver  %{nil}
@@ -309,3 +314,18 @@ install -D -m 644 %1-16.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/
 %global __find_provides /bin/sh -c "%{?__filter_prov_cmd} %{__deploop P} %{?__filter_from_prov}" \
 %global __find_requires /bin/sh -c "%{?__filter_req_cmd}  %{__deploop R} %{?__filter_from_req}" \
 }
+
+%remove_docs \
+  rm -rf %{?buildroot:%{buildroot}}%{_infodir} \
+  rm -rf %{?buildroot:%{buildroot}}%{_defaultdocdir} \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name} \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc/%{name}-%{version} \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/gtk-doc \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/doc \
+  rm -rf %{?buildroot:%{buildroot}}%{_datadir}/man \
+  find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]" | xargs rm -f -- \
+  find %{?buildroot:%{buildroot}} -regex ".*/man/../man./.*\.[0-9]" | xargs rm -f -- \
+  find %{?buildroot:%{buildroot}} -regex ".*/man/man./.*\.[0-9]pm" | xargs rm -f --
+
+%ext_info .gz
+%ext_man .gz
diff --git a/packaging/mimetype.diff b/packaging/mimetype.diff
index e69de29..e69de29 100644..100755
--- a/packaging/mimetype.diff
+++ b/packaging/mimetype.diff
diff --git a/packaging/no_rep_autop.diff b/packaging/no_rep_autop.diff
index 3211173..3211173 100644..100755
--- a/packaging/no_rep_autop.diff
+++ b/packaging/no_rep_autop.diff
diff --git a/packaging/nodigest.patch b/packaging/nodigest.patch
index 1eb101b..1eb101b 100644..100755
--- a/packaging/nodigest.patch
+++ b/packaging/nodigest.patch
diff --git a/packaging/optflags.patch b/packaging/optflags.patch
index 5b6f51e..794db22 100644
--- a/packaging/optflags.patch
+++ b/packaging/optflags.patch
@@ -34,8 +34,8 @@
 -optflags: armv5tejl -O2 -g -march=armv5te
 -optflags: armv6l -O2 -g -march=armv6
 -optflags: armv7l -O2 -g -march=armv7
--optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb
--optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb
+-optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
+-optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon
 -optflags: armv7thl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
 -optflags: armv7tnhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb
 +optflags: armv3l %{__global_cflags} -fsigned-char -march=armv3
@@ -45,9 +45,9 @@
 +optflags: armv5tejl %{__global_cflags} -march=armv5te
 +Optflags: armv5tel %{__global_cflags}   -fmessage-length=0 -march=armv5te -mlittle-endian
 +Optflags: armv6l %{__global_cflags}  -fmessage-length=0 -march=armv6 -mlittle-endian  -mfpu=vfp -mfloat-abi=softfp -D__SOFTFP__
-+Optflags: armv7l %{__global_cflags}  -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=vfpv3 -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb
-+optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb
-+optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb  
++Optflags: armv7l %{__global_cflags}  -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian  -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb
++optflags: armv7hl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
++optflags: armv7nhl %{__global_cflags} -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon
 +optflags: armv7thl %{__global_cflags}  -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
 +optflags: armv7tnhl %{__global_cflags}  -fmessage-length=0 -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb  
 +
diff --git a/packaging/pythondeps.diff b/packaging/pythondeps.diff
index 90bf61f..90bf61f 100644..100755
--- a/packaging/pythondeps.diff
+++ b/packaging/pythondeps.diff
diff --git a/packaging/remove-translations.patch b/packaging/remove-translations.patch
index 6555226..6555226 100644..100755
--- a/packaging/remove-translations.patch
+++ b/packaging/remove-translations.patch
diff --git a/packaging/rpm-4.5.90-gstreamer-provides.patch b/packaging/rpm-4.5.90-gstreamer-provides.patch
index a9ebfe2..a9ebfe2 100644..100755
--- a/packaging/rpm-4.5.90-gstreamer-provides.patch
+++ b/packaging/rpm-4.5.90-gstreamer-provides.patch
diff --git a/packaging/rpm-4.5.90-pkgconfig-path.patch b/packaging/rpm-4.5.90-pkgconfig-path.patch
index 07ce123..07ce123 100644..100755
--- a/packaging/rpm-4.5.90-pkgconfig-path.patch
+++ b/packaging/rpm-4.5.90-pkgconfig-path.patch
diff --git a/packaging/rpm-4.7.90-devel-autodep.patch b/packaging/rpm-4.7.90-devel-autodep.patch
index 84e5cee..84e5cee 100644..100755
--- a/packaging/rpm-4.7.90-devel-autodep.patch
+++ b/packaging/rpm-4.7.90-devel-autodep.patch
diff --git a/packaging/rpm-4.8.0-tilde.patch b/packaging/rpm-4.8.0-tilde.patch
index 1132c37..1132c37 100644..100755
--- a/packaging/rpm-4.8.0-tilde.patch
+++ b/packaging/rpm-4.8.0-tilde.patch
diff --git a/packaging/rpm-4.9.0-tizen-arm.patch b/packaging/rpm-4.9.0-tizen-arm.patch
index b977090..1ef1154 100644..100755
--- a/packaging/rpm-4.9.0-tizen-arm.patch
+++ b/packaging/rpm-4.9.0-tizen-arm.patch
@@ -19,8 +19,8 @@ Index: rpm-4.9.0/rpmrc.in
  optflags: armv5tejl -O2 -g -march=armv5te
  optflags: armv6l -O2 -g -march=armv6
  optflags: armv7l -O2 -g -march=armv7
-+optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mno-thumb
-+optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mno-thumb
++optflags: armv7hl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16
++optflags: armv7nhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon
 +optflags: armv7thl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=vfpv3-d16 -mthumb
 +optflags: armv7tnhl -O2 -g -march=armv7-a -mfloat-abi=hard -mfpu=neon -mthumb
  
diff --git a/packaging/rpm-beecrypt.diff b/packaging/rpm-beecrypt.diff
index 55036f7..55036f7 100644..100755
--- a/packaging/rpm-beecrypt.diff
+++ b/packaging/rpm-beecrypt.diff
diff --git a/packaging/rpm-gst-provides.patch b/packaging/rpm-gst-provides.patch
index afbc2a6..afbc2a6 100644..100755
--- a/packaging/rpm-gst-provides.patch
+++ b/packaging/rpm-gst-provides.patch
diff --git a/packaging/rpm-macros.patch b/packaging/rpm-macros.patch
index 44dfb31..44dfb31 100644..100755
--- a/packaging/rpm-macros.patch
+++ b/packaging/rpm-macros.patch
diff --git a/packaging/rpm-python.manifest b/packaging/rpm-python.manifest
index 017d22d..017d22d 100644..100755
--- a/packaging/rpm-python.manifest
+++ b/packaging/rpm-python.manifest
diff --git a/packaging/rpm-python.spec b/packaging/rpm-python.spec
index 6671a65..cbb8fa8 100644..100755
--- a/packaging/rpm-python.spec
+++ b/packaging/rpm-python.spec
@@ -14,11 +14,11 @@
 
 Summary: The RPM package management system
 Name: rpm-python
+License:        GPLv2+
 Version: %{rpmver}
 Release: 4
-License: GPLv2+
 BuildRequires: python-devel
-%{expand:%(sed -n -e '/^Source0:/,/^##PYTHON##/p' <%_sourcedir/rpm.spec)}
+%{expand:%(sed -n -e '/^Source1002:/d' -e '/^Source0:/,/^##PYTHON##/p' <%_sourcedir/rpm.spec)}
 Source100: rpm.spec
 Source1002: rpm-python.manifest 
 Requires: popt >= 1.10.2.1
@@ -41,12 +41,11 @@ BuildRequires: ncurses-devel
 BuildRequires: bzip2-devel >= 0.9.0c-2
 BuildRequires: liblua-devel >= 5.1
 BuildRequires: libcap-devel
+BuildRequires: xz-devel >= 4.999.8
+BuildRequires: uthash-devel
 BuildRequires: libxml2-devel
 BuildRequires: libattr-devel
-BuildRequires: uthash-devel
-BuildRequires: smack-devel
-BuildRequires: xz-devel >= 4.999.8
-
+BuildRequires: pkgconfig(libsmack)
 
 %description
 The RPM Package Manager (RPM) is a powerful command line driven
@@ -62,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 
 cp %{SOURCE1002} .
 make DESTDIR="$RPM_BUILD_ROOT" install
-find "%{buildroot}" -not -type d -and -not -path %{buildroot}%{_libdir}/python%{py_ver}/site-packages/rpm/\* -print0 | xargs -0 rm
+find "%{buildroot}" -not -type d -and -not -path %{buildroot}/usr/lib/python%{py_ver}/site-packages/rpm/\* -print0 | xargs -0 rm
 pushd $RPM_BUILD_ROOT/%py_sitedir/rpm
 rm -f _rpmmodule.a _rpmmodule.la
 python %py_libdir/py_compile.py *.py
@@ -75,5 +74,5 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %manifest rpm-python.manifest
 %defattr(-,root,root)
-%{_libdir}/python*
+/usr/lib/python*
 
diff --git a/packaging/rpm-shorten-changelog.patch b/packaging/rpm-shorten-changelog.patch
index b5f20b2..b5f20b2 100644..100755
--- a/packaging/rpm-shorten-changelog.patch
+++ b/packaging/rpm-shorten-changelog.patch
diff --git a/packaging/rpm.manifest b/packaging/rpm.manifest
index 1b09e73..1b09e73 100644..100755
--- a/packaging/rpm.manifest
+++ b/packaging/rpm.manifest
diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index b2f70cb..38107c3 100644..100755
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -4,8 +4,9 @@
 
 
 Name:           rpm
+VCS:            external/rpm#ffd7318edc23db77145257774c704b33d171bde0
 Version:        4.9.1
-Release:        %{release_prefix}
+Release:        %{?release_prefix:%{release_prefix}.}5.3.%{?dist}%{!?dist:tizen}
 Summary:        The RPM package management system
 Url:            http://www.rpm.org/
 # Partially GPL/LGPL dual-licensed and some bits with BSD
@@ -179,7 +180,15 @@ rm -f rpmdb/db.h
 %patch86 -p1
 %patch87 -p1 -b .msm
 
+%{?opt_mcpu: %define replace_mopt 1}
+%{!?opt_mcpu: %define replace_mopt 0}
 
+%if %{replace_mopt}
+sed -e "/^Optflags: %{_target_cpu}/ s/-march[^ ]*/-mcpu=%{opt_mcpu}/g" -i rpmrc.in
+sed -e "/^Optflags: %{_target_cpu}/ s/-mtune[^ ]*//g" -i rpmrc.in
+sed -e "/^Optflags: %{_target_cpu}/ s/  / /g" -i rpmrc.in
+grep "^Optflags: %{_target_cpu}" -rn rpmrc.in
+%endif
 
 rm -f m4/libtool.m4
 rm -f m4/lt*.m4
@@ -195,6 +204,11 @@ export CPPFLAGS CFLAGS LDFLAGS
 
 libtoolize -f -c
 ./autogen.sh \
+%ifarch %arm
+    --build=%{_target_cpu}-tizen-linux-gnueabi \
+%else
+    --build=%{_target_cpu}-tizen-linux-gnu \
+%endif
     --prefix=%{_prefix} \
     --sysconfdir=%{_sysconfdir} \
     --localstatedir=%{_localstatedir} \
@@ -204,6 +218,7 @@ libtoolize -f -c
 %if %{with python}
     --enable-python \
 %endif
+    --with-vendor=tizen \
     --with-lua \
     --with-cap  \
     --with-msm \
@@ -218,9 +233,10 @@ find %{buildroot} -regex ".*\\.la$" | xargs rm -f --
 
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{_libexecdir}/rpm
+mkdir -p %{buildroot}%{_libexecdir}/rpm-plugins
 install -m 644 %{SOURCE1} %{buildroot}%{_libexecdir}/rpm/fileattrs/libsymlink.attr
 install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_sysconfdir}/device-sec-policy
-install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_libdir}/rpm-plugins/msm-device-sec-policy
+install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_libexecdir}/rpm-plugins/msm-device-sec-policy
 mkdir -p %{buildroot}%{_localstatedir}/lib/rpm
 
 #install -m 755 scripts/firmware.prov %{buildroot}%{_prefix}/lib/rpm
@@ -382,6 +398,6 @@ exit 0
 %defattr(-,root,root)
 %{_libdir}/rpm-plugins/msm.so
 %config(noreplace) %{_sysconfdir}/device-sec-policy
-%{_libdir}/rpm-plugins/msm-device-sec-policy
+%{_libexecdir}/rpm-plugins/msm-device-sec-policy
 /usr/share/license/%{name}-security-plugin
 %manifest rpm.manifest
diff --git a/packaging/rpmbuild_4.9.1_fix.patch b/packaging/rpmbuild_4.9.1_fix.patch
index fb46271..fb46271 100644..100755
--- a/packaging/rpmbuild_4.9.1_fix.patch
+++ b/packaging/rpmbuild_4.9.1_fix.patch
diff --git a/packaging/rpmbuild_rpmfc_4.9.1_fix.patch b/packaging/rpmbuild_rpmfc_4.9.1_fix.patch
index cf68be8..cf68be8 100644..100755
--- a/packaging/rpmbuild_rpmfc_4.9.1_fix.patch
+++ b/packaging/rpmbuild_rpmfc_4.9.1_fix.patch
diff --git a/packaging/rpmio_base64_4.9.1_fix.patch b/packaging/rpmio_base64_4.9.1_fix.patch
index 71d8ef4..71d8ef4 100644..100755
--- a/packaging/rpmio_base64_4.9.1_fix.patch
+++ b/packaging/rpmio_base64_4.9.1_fix.patch
diff --git a/packaging/rpmlib_format_value_4.9.1_fix.patch b/packaging/rpmlib_format_value_4.9.1_fix.patch
index ae0293c..ae0293c 100644..100755
--- a/packaging/rpmlib_format_value_4.9.1_fix.patch
+++ b/packaging/rpmlib_format_value_4.9.1_fix.patch
diff --git a/packaging/security_4.9.1.patch b/packaging/security_4.9.1.patch
index 8c82fbf..ad7d660 100644..100755
--- a/packaging/security_4.9.1.patch
+++ b/packaging/security_4.9.1.patch
@@ -54,10 +54,10 @@ diff -Nuarp rpm/build/parsePreamble.c rpm-security/build/parsePreamble.c
  	if (nump == NULL || *nump == '\0') {
  	    num = flag == RPMBUILD_ISSOURCE ? 0 : INT_MAX;
  	} else {
-@@ -891,6 +891,7 @@ static struct PreambleRec_s const preamb
-     {RPMTAG_BUGURL,		0, 0, LEN_AND_STR("bugurl")},
-     {RPMTAG_COLLECTIONS,	0, 0, LEN_AND_STR("collections")},
-     {RPMTAG_ORDERFLAGS,		2, 0, LEN_AND_STR("orderwithrequires")},
+@@ -913,6 +913,7 @@ static struct PreambleRec_s const preambleList[] = {
+     {RPMTAG_BUILDSUGGESTS,	0, 0, LEN_AND_STR("buildsuggests")},
+     {RPMTAG_BUILDENHANCES,	0, 0, LEN_AND_STR("buildsupplements")},
+     {RPMTAG_BUILDENHANCES,	0, 0, LEN_AND_STR("buildenhances")},
 +    {RPMTAG_SECMANIFEST,	0, 0, LEN_AND_STR("manifest")},
      {0, 0, 0, 0}
  };
@@ -4323,7 +4323,7 @@ diff -Nuarp rpm/security/msmmatch.c rpm-security/security/msmmatch.c
 diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c
 --- rpm/security/msmxattr.c	1970-01-01 02:00:00.000000000 +0200
 +++ rpm-security/security/msmxattr.c	2012-10-01 10:29:50.327983644 +0300
-@@ -0,0 +1,1338 @@
+@@ -0,0 +1,1344 @@
 +/*
 + * This file is part of MSM security plugin
 + * Greatly based on the code of MSSF security plugin
@@ -5045,6 +5045,8 @@ diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c
 +		rpmlog(RPMLOG_ERR, "Request for a domain name %s that hasn't been yet defined by any package\n", mfx->request->ac_domain);
 + #ifdef ENABLE_DCHECKS
 +		return -1;
++ #else
++               return 0;
 + #endif
 +	}
 +
@@ -5061,6 +5063,8 @@ diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c
 +	if (msmCheckDomainJoinPossibility(mfx, defined_ac_domain) < 0 )
 + #ifdef ENABLE_DCHECKS
 +		return -1;
++ #else
++               return 0;
 + #endif
 +	
 +	// now checking if security policy allows to join this domain
@@ -5072,6 +5076,8 @@ diff -Nuarp rpm/security/msmxattr.c rpm-security/security/msmxattr.c
 +	    rpmlog(RPMLOG_ERR, "Request for a domain name %s isn't allowed based on package sw source\n", mfx->request->ac_domain);
 + #ifdef ENABLE_DCHECKS
 +	    return -1;
++ #else
++           return 0;
 + #endif
 +	}
 +  return 0;