From 86c70f27303a48b59aba6bbf62f2ef849a73107e5a333aaf7c0a48babd43afe3 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 2 Oct 2009 22:27:24 +0000
Subject: [PATCH] checked in

OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=20
---
 openldap2-client.changes |  6 -----
 openldap2-client.spec    |  7 ++----
 openldap2.changes        |  6 -----
 openldap2.spec           |  3 ---
 schema2ldif              | 52 ----------------------------------------
 5 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 schema2ldif

diff --git a/openldap2-client.changes b/openldap2-client.changes
index 0d808bc..956fda4 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Sep 28 13:59:18 UTC 2009 - rhafer@novell.com
-
-- Added schema2ldif tool to openldap2-client subpackage 
-  (bnc#541819) 
-
 -------------------------------------------------------------------
 Wed Sep 23 15:35:13 UTC 2009 - rhafer@novell.com
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index faf49d8..7d65c23 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package openldap2 (Version 2.4.17)
+# spec file for package openldap2-client (Version 2.4.17)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,7 +18,7 @@
 # norootforbuild
 
 
-Name:         openldap2-client
+Name:           openldap2-client
 BuildRequires:  cyrus-sasl-devel db-devel libopenssl-devel openslp-devel tcpd-devel
 %if %sles_version == 9
 BuildRequires:  -db-devel -libopenssl-devel -pwdutils libdb-4_5-devel openssl-devel
@@ -50,7 +50,6 @@ Source2:        addonschema.tar.gz
 Source3:        DB_CONFIG
 Source4:        sasl-slapd.conf
 Source5:        README.update
-Source6:        schema2ldif
 Source100:      openldap-2.3.37.tar.bz2
 Patch:          openldap2.dif
 Patch2:         slapd_conf.dif
@@ -288,7 +287,6 @@ install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so*
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif
 %if "%{name}" == "openldap2"
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 644 sysconfig.openldap $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.openldap
@@ -369,7 +367,6 @@ cat > openldap2-client.filelist <<EOF
 /usr/bin/ldappasswd
 /usr/bin/ldapurl
 /usr/bin/ldapwhoami
-/usr/sbin/schema2ldif
 %doc %{_mandir}/man1/ldap*
 %doc %{_mandir}/man5/ldap.conf*
 %doc %{_mandir}/man5/ldif.*
diff --git a/openldap2.changes b/openldap2.changes
index 0d808bc..956fda4 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Mon Sep 28 13:59:18 UTC 2009 - rhafer@novell.com
-
-- Added schema2ldif tool to openldap2-client subpackage 
-  (bnc#541819) 
-
 -------------------------------------------------------------------
 Wed Sep 23 15:35:13 UTC 2009 - rhafer@novell.com
 
diff --git a/openldap2.spec b/openldap2.spec
index 41fb40a..90ae580 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -50,7 +50,6 @@ Source2:        addonschema.tar.gz
 Source3:        DB_CONFIG
 Source4:        sasl-slapd.conf
 Source5:        README.update
-Source6:        schema2ldif
 Source100:      openldap-2.3.37.tar.bz2
 Patch:          openldap2.dif
 Patch2:         slapd_conf.dif
@@ -288,7 +287,6 @@ install -m 755 -d $RPM_BUILD_ROOT/var/lib/ldap
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/liblber.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap_r.so*
 chmod a+x $RPM_BUILD_ROOT/%{_libdir}/libldap.so*
-install -m 755 %{SOURCE6} $RPM_BUILD_ROOT/usr/sbin/schema2ldif
 %if "%{name}" == "openldap2"
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 install -m 644 sysconfig.openldap $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.openldap
@@ -369,7 +367,6 @@ cat > openldap2-client.filelist <<EOF
 /usr/bin/ldappasswd
 /usr/bin/ldapurl
 /usr/bin/ldapwhoami
-/usr/sbin/schema2ldif
 %doc %{_mandir}/man1/ldap*
 %doc %{_mandir}/man5/ldap.conf*
 %doc %{_mandir}/man5/ldif.*
diff --git a/schema2ldif b/schema2ldif
deleted file mode 100644
index 4ba0afd..0000000
--- a/schema2ldif
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-#
-# This is a simple tool to convert OpenLDAP Schema files to
-# LDIF suitable for usage with OpenLDAP's dynamic configuration
-# backend (cn=config)
-#
-# usage:
-# schema2ldif <input file>
-#
-# The generated LDIF is printed to stdout.
-#
-
-if [ -z "$1" ]; then
-    echo 'usage: schema2ldif <input file>'
-    exit;
-fi
-
-cn=`basename $1 .schema`
-
-echo "dn: cn=$cn,cn=schema,cn=config";
-echo "objectclass: olcSchemaConfig";
-echo "cn: $cn";
-
-/usr/bin/awk '
-BEGIN { 
-    buffer = "";
-    width=78 ;
-}
-function wrap(data)
-{
-    if (length(data) > 0) {
-        do {
-            print substr(data,0,width);
-            data = " " substr(data, width+1);
-        }
-        while (length(data) > 1  )
-    };
-}
-/^[\t ]*$/ {wrap(buffer); buffer=""; print "#"; next; }
-/^#.*$/ { wrap(buffer); buffer=""; print $0; next }
-/^[\t ]+/ { gsub("^[\t ]+",""); buffer = buffer " " $0; next; }
-{
-        wrap(buffer);
-	$1 = tolower($1) ;
-	gsub("^objectclass$","olcObjectclasses:",$1)
-	gsub("^attributetype$","olcAttributeTypes:",$1)
-	gsub("^objectidentifier$","olcObjectIdentifier:",$1)
-        buffer = $0;
-}
-END { wrap(buffer); print "" }
-' "$@"
-