Include missing file from version plugin and update min version of 389-ds

2 files changed, 57 insertions, 2 deletions

diff --git a/daemons/ipa-version.h.in b/daemons/ipa-version.h.in
new file mode 100644
index 00000000..6af9ebff
--- /dev/null
+++ b/daemons/ipa-version.h.in
@@ -0,0 +1,50 @@
+/** BEGIN COPYRIGHT BLOCK
+ * This Program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; version 2 of the License.
+ *
+ * This Program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ * Place, Suite 330, Boston, MA 02111-1307 USA.
+ *
+ * In addition, as a special exception, Red Hat, Inc. gives You the additional
+ * right to link the code of this Program with code not covered under the GNU
+ * General Public License ("Non-GPL Code") and to distribute linked combinations
+ * including the two, subject to the limitations in this paragraph. Non-GPL Code
+ * permitted under this exception must only link to the code of this Program
+ * through those well defined interfaces identified in the file named EXCEPTION
+ * found in the source code files (the "Approved Interfaces"). The files of
+ * Non-GPL Code may instantiate templates or use macros or inline functions from
+ * the Approved Interfaces without causing the resulting work to be covered by
+ * the GNU General Public License. Only Red Hat, Inc. may make changes or
+ * additions to the list of Approved Interfaces. You must obey the GNU General
+ * Public License in all respects for all of the Program code and other code used
+ * in conjunction with the Program except the Non-GPL Code covered by this
+ * exception. If you modify this file, you may extend this exception to your
+ * version of the file, but you are not obligated to do so. If you do not wish to
+ * provide this exception without modification, you must delete this exception
+ * statement from your version and license this file solely under the GPL without
+ * exception.
+ *
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ * END COPYRIGHT BLOCK **/
+
+/* The full version including strings */
+#define VERSION "__VERSION__"
+
+/* Just the numeric portion of the version so one can do direct numeric
+   comparisons to see if the API is compatible.
+ */
+#define NUM_VERSION __NUM_VERSION__
+
+/* The data version. This is distinguished from the server version based
+   on the compatibility of the data/plugins/etc from one version to another.
+*/
+#define DATA_VERSION __DATA_VERSION__
diff --git a/ipa.spec.in b/ipa.spec.in
index 9d6aa69f..0e9e6fff 100644
--- a/ipa.spec.in
+++ b/ipa.spec.in
@@ -23,7 +23,7 @@ Source0:        freeipa-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if ! %{ONLY_CLIENT}
-BuildRequires:  fedora-ds-base-devel >= 1.1.3
+BuildRequires:  389-ds-base-devel >= 1.2.6
 BuildRequires:  mozldap-devel
 BuildRequires:  svrcore-devel
 BuildRequires:  nspr-devel
@@ -62,7 +62,7 @@ Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-client = %{version}-%{release}
 Requires: %{name}-admintools = %{version}-%{release}
 Requires(post): %{name}-server-selinux = %{version}-%{release}
-Requires: fedora-ds-base >= 1.1.3
+Requires: 389-ds-base >= 1.2.6
 Requires: openldap-clients
 Requires: nss
 Requires: nss-tools
@@ -498,6 +498,11 @@ fi
 %endif
 
 %changelog
+* Thu Jun 24 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-23
+- Change Requires from fedora-ds-base to 389-ds-base
+- Set minimum level of 389-ds-base to 1.2.6 for the replication
+  version plugin.
+
 * Tue Jun  1 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-22
 - Drop Requires of python-krbV on ipa-client