Author: glen Date: Fri Feb 19 16:10:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- use readlink -m instead of readlink -f to allow missing paths
---- Files affected:
packages/rpm-build-macros:
rpm-build-macros.spec (1.239 -> 1.240) , rpm.macros (1.541 -> 1.542)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.239
packages/rpm-build-macros/rpm-build-macros.spec:1.240
--- packages/rpm-build-macros/rpm-build-macros.spec:1.239 Fri Feb 19
11:03:34 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec Fri Feb 19 17:10:49 2010
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%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
@@ -68,11 +68,11 @@
%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
@@ -91,6 +91,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.240 2010/02/19 16:10:49 glen
+- use readlink -m instead of readlink -f to allow missing paths
+
Revision 1.239 2010/02/19 10:03:34 arekm
- block as broken
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.541
packages/rpm-build-macros/rpm.macros:1.542
--- packages/rpm-build-macros/rpm.macros:1.541 Fri Feb 19 11:04:40 2010
+++ packages/rpm-build-macros/rpm.macros Fri Feb 19 17:10:49 2010
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.239&r2=1.240&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.541&r2=1.542&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
