From ddeaa8deb27be435266d79780094929c16c97a94 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Fri, 19 Feb 2010 16:10:49 +0000
Subject: [PATCH] - use readlink -m instead of readlink -f to allow missing
 paths

Changed files:
    rpm-build-macros.spec -> 1.240
    rpm.macros -> 1.542
---
 rpm-build-macros.spec | 12 ++++++------
 rpm.macros            | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 82611e1..f7daebc 100644
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define		rpm_macros_rev	1.540
+%define		rpm_macros_rev	1.541
 %define		find_lang_rev	1.32
 Summary:	PLD Linux RPM build macros
 Summary(pl.UTF-8):	Makra do budowania pakietów RPM dla Linuksa PLD
@@ -67,11 +67,11 @@ fi
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_usrlibrpm},/etc/shrc.d}
-cp rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
-install %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
-install %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
-install %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
+cp -a rpm.macros $RPM_BUILD_ROOT%{_usrlibrpm}/macros.build
+install -p %{SOURCE1} $RPM_BUILD_ROOT%{_usrlibrpm}/service_generator.sh
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_usrlibrpm}/find-lang.sh
+install -p %{SOURCE4} $RPM_BUILD_ROOT%{_usrlibrpm}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/rpm.macros b/rpm.macros
index a9e456b..648a954 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -59,22 +59,22 @@
 %_topdir    %{expand:%%global _topdir %(
 	if [ -d SPECS -a -d SOURCES ]; then
 		# old style rpmdir: in topdir
-		readlink -f .
+		readlink -m .
 	elif [ -d ../SPECS -a -d ../SOURCES ]; then
 		# old style rpmdir: in subdir
-		readlink -f ..
+		readlink -m ..
 	elif [ -d $HOME/rpm/SPECS -a -d $HOME/rpm/SOURCES ]; then \
 		# if old style rpm dir exist, go with it
 		echo $HOME/rpm; \
 	elif [ -x ../builder -a ! -d ../builder ]; then
 		# relative new style rpmdir: in package dir
-		readlink -f ..
+		readlink -m ..
 	elif [ -x builder -a ! -d builder ]; then
 		# relative new style rpmdir: in packages
-		readlink -f .
+		readlink -m .
 	elif [ -x packages/builder -a ! -d packages/builder ]; then
 		# relative new style rpmdir: packages dir in current dir
-		readlink -f packages
+		readlink -m packages
 	else
 		# fallback to new style rpmdir
 		echo $HOME/rpm/packages
@@ -88,9 +88,9 @@
 # BUILD/RPMS/SRPMS are one same level by default as packages dir, if these exist
 # if they don't exist assume we are having custom topdir (which is not named as
 # "packages", i.e ~/rpm/kde/{kdelibs,BUILD/RPMS/SRPMS})
-%_builddir		%{expand:%%global _builddir %(if [ -d %{_topdir}/../BUILD ]; then readlink -f %{_topdir}/../BUILD; else echo %{_topdir}/BUILD; fi)}%_builddir
-%_rpmdir		%{expand:%%global _rpmdir %(if [ -d %{_topdir}/../RPMS ]; then readlink -f %{_topdir}/../RPMS; else echo %{_topdir}/RPMS; fi)}%_rpmdir
-%_srcrpmdir		%{expand:%%global _srcrpmdir %(if [ -d %{_topdir}/../SRPMS ]; then readlink -f %{_topdir}/../SRPMS; else echo %{_topdir}/SRPMS; fi)}%_srcrpmdir
+%_builddir		%{expand:%%global _builddir %(if [ -d %{_topdir}/../BUILD ]; then readlink -m %{_topdir}/../BUILD; else echo %{_topdir}/BUILD; fi)}%_builddir
+%_rpmdir		%{expand:%%global _rpmdir %(if [ -d %{_topdir}/../RPMS ]; then readlink -m %{_topdir}/../RPMS; else echo %{_topdir}/RPMS; fi)}%_rpmdir
+%_srcrpmdir		%{expand:%%global _srcrpmdir %(if [ -d %{_topdir}/../SRPMS ]; then readlink -m %{_topdir}/../SRPMS; else echo %{_topdir}/SRPMS; fi)}%_srcrpmdir
 
 #	The number of cvs changelog entries kept when building package.
 %_buildchangelogtruncate 20
-- 
2.43.0