RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 25-Feb-2011 10:28:26
Branch: rpm-5_3 Handle: 2011022509282501
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/lib depends.c
Log:
permit in configure phase to enable the
optional-dirname-and-symlink-deps used by Mandriva and Ark today
(ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
Summary:
Revision Changes Path
1.3296.2.165+3 -0 rpm/CHANGES
2.432.2.47 +13 -0 rpm/configure.ac
1.461.2.2 +4 -4 rpm/lib/depends.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3296.2.164 -r1.3296.2.165 CHANGES
--- rpm/CHANGES 24 Feb 2011 19:33:49 -0000 1.3296.2.164
+++ rpm/CHANGES 25 Feb 2011 09:28:25 -0000 1.3296.2.165
@@ -1,4 +1,7 @@
5.3.8 -> 5.3.9:
+ - devzero2000: permit in configure phase to enable the
+ optional-dirname-and-symlink-deps used by Mandriva and Ark today
+ (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
- proyvind: use expanded %{___NVRA} for 'rpm --last'.
- devzero2000: merge Suse patch. Set "%_specfile" macro in the build so
that people can
do specfile manipulation/data extraction in the build.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.432.2.46 -r2.432.2.47 configure.ac
--- rpm/configure.ac 9 Jan 2011 03:58:11 -0000 2.432.2.46
+++ rpm/configure.ac 25 Feb 2011 09:28:25 -0000 2.432.2.47
@@ -351,6 +351,19 @@
[ENABLE_BUILD_LAFILES],
[test ".$do_build_lafiles" = .yes])
+dnl # optional sysmlink and parentdir dependency
+AC_ARG_ENABLE(
+ [dirname-and-symlink-deps],
+ AS_HELP_STRING([--disable-dirname-and-symlink-deps],[permit to disable
via macro the automatic dirname and symlink dependecy]),
+ [ do_optional_dirname_and_symlink_deps=$enableval ],
+ [ do_optional_dirname_and_symlink_deps=yes ])
+
+AS_IF([test "x$do_optional_dirname_and_symlink_deps" != xyes],
+ [
+ AC_DEFINE([RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS],[1],[permit to disable
via macro the automatic dirname and symlink dependecy])
+ ])
+
+
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.461.2.1 -r1.461.2.2 depends.c
--- rpm/lib/depends.c 8 Jan 2011 23:12:14 -0000 1.461.2.1
+++ rpm/lib/depends.c 25 Feb 2011 09:28:26 -0000 1.461.2.2
@@ -1569,7 +1569,7 @@
int terminate = 2; /* XXX terminate if rc >= terminate */
int rc;
int ourrc = 0;
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
int dirname_deps;
int symlink_deps;
#endif
@@ -1648,7 +1648,7 @@
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
dirname_deps =
rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}");
if (dirname_deps) {
#endif
@@ -1692,7 +1692,7 @@
/*@switchbreak@*/ break;
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
}
symlink_deps =
rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}");
@@ -1740,7 +1740,7 @@
/*@switchbreak@*/ break;
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
}
#endif
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
