Author: glen Date: Fri Feb 19 16:12:51 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fallback to ~/rpm/{RPMS,SRPMS,BUILD} of they don't exist in topdir (old mode)
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.542 -> 1.543)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.542
packages/rpm-build-macros/rpm.macros:1.543
--- packages/rpm-build-macros/rpm.macros:1.542 Fri Feb 19 17:10:49 2010
+++ packages/rpm-build-macros/rpm.macros Fri Feb 19 17:12:45 2010
@@ -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 -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
+%_builddir %{expand:%%global _builddir %(if [ -d %{_topdir}/BUILD
]; then echo %{_topdir}/BUILD; else readlink -m %{_topdir}/../BUILD;
fi)}%_builddir
+%_rpmdir %{expand:%%global _rpmdir %(if [ -d %{_topdir}/RPMS ];
then echo %{_topdir}/RPMS; else readlink -m %{_topdir}/../RPMS; fi)}%_rpmdir
+%_srcrpmdir %{expand:%%global _srcrpmdir %(if [ -d %{_topdir}/SRPMS
]; then echo %{_topdir}/SRPMS; else readlink -m %{_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.macros?r1=1.542&r2=1.543&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
