Merge "Fixed incorrect writting host_os to platform/macros for uClibc" into tizen

diff --git a/packaging/rpm-tizen_macros b/packaging/rpm-tizen_macros
index e7648f9..253f89c 100644 (file)
--- a/packaging/rpm-tizen_macros
+++ b/packaging/rpm-tizen_macros
@@ -4,8 +4,11 @@
 %_sysconfdir            /etc
 %_localstatedir         /var
 %_defaultdocdir         %{_usr}/share/doc/packages
-%_unitdir_user /usr/lib/systemd/user
-%_unitdir /usr/lib/systemd/system
+
+# _rootprefix can be set to (/,%{_prefix}) to customize systemd installation)
+%_rootprefix %{_prefix}
+%_unitdir_user %{_prefix}/lib/systemd/user
+%_unitdir %{_rootprefix}/lib/systemd/system
 
 # package build macros
 # %make_install           make install DESTDIR=%{?buildroot}
@@ -165,7 +168,6 @@
 %lang_package(n:f:) \
 %package %{-n:-n %{-n*}-}locale \
 Summary: Translations and Locale for package %{name}\
-Group: System/Localization\
 Requires: %{-n:%{-n*}}%{!-n:%{name}} = %{version} \
 Provides: %{-n:%{-n*}}%{!-n:%{name}}-lang-all = %{version} \
 BuildArch:  noarch \
@@ -178,7 +180,6 @@ This package provides translations for package %{name}.\
 %docs_package \
 %package docs \
 Summary: Documentation for package %{name}\
-Group: Documentation\
 AutoReqProv: 0\
 %description docs\
 This package provides documentation for package %{name}.\

diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index 9ac417e..9555fca 100644 (file)
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -193,20 +193,18 @@ mkdir -p %{buildroot}%{_sysconfdir}/rpm
 chmod 755 %{buildroot}%{_sysconfdir}/rpm
 mkdir -p %{buildroot}%{rpmhome}/macros.d
 # remove some nonsense or non-working scripts
-pushd %{buildroot}%{rpmhome}/
 for f in rpm2cpio.sh rpm.daily rpmdiff* rpm.log rpm.xinetd freshen.sh u_pkg.sh \
          magic magic.mgc magic.mime* rpmfile *.pl javadeps brp-redhat \
          brp-strip-static-archive vpkg-provides*.sh http.req sql.req tcl.req \
          rpmdb_* brp-sparc64-linux brp-strip-comment-note brp-java-gcjcompile
 do
-    rm -f $f
+    rm -f %{buildroot}%{rpmhome}/$f
 done
 for i in %{_datadir}/automake-*/*; do
-  if test -f "$i" && test -f "${i##*/}"; then
-    rm -f "${i##*/}"
+  if test -f "$i" && test -f %{buildroot}%{rpmhome}/"${i##*/}"; then
+    rm -f %{buildroot}%{rpmhome}/"${i##*/}"
   fi
 done
-popd
 %ifarch aarch64 ppc64le
 install -m 755 config.guess %{buildroot}/usr/lib/rpm
 install -m 755 config.sub %{buildroot}/usr/lib/rpm

diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.sh
index c73f06b..efcc72e 100644 (file)
--- a/scripts/find-debuginfo.sh
+++ b/scripts/find-debuginfo.sh
@@ -237,7 +237,7 @@ strict_error=ERROR
 $strict || strict_error=WARNING
 
 # Strip ELF binaries (and no static libraries)
-find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm +111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z |
+find $RPM_BUILD_ROOT ! -path "${debugdir}/*.debug" -type f \( -perm /111 -or -name "*.so*" -or -name "*.ko" \) ! -name "*.a" -print0 | sort -z |
 xargs --no-run-if-empty -0 stat -c '%h %D_%i %n' |
 while read nlinks inum f; do
   case $(objdump -h $f 2>/dev/null | egrep -o '(debug[\.a-z_]*|gnu.version)') in