rpms/openldap/devel README.migration, NONE, 1.1 .cvsignore, 1.38, 1.39 openldap.spec, 1.118, 1.119 sources, 1.40, 1.41

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14458

Modified Files:
	.cvsignore openldap.spec sources 
Added Files:
	README.migration 
Log Message:
migration tools carved out to standalone package "migrationtools"
Resolves: #236697


--- NEW FILE README.migration ---
As from Fedora 9, MigrationTools are shipped as separate package.
Install "migrationtools" package to get them, e.g.:

yum install migrationtools

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore	14 Jan 2008 13:21:58 -0000	1.38
+++ .cvsignore	29 Feb 2008 08:40:16 -0000	1.39
@@ -1,14 +1,2 @@
-openldap-2.2.29.tgz
-MigrationTools-47.tar.gz
-openldap-2.3.19.tgz
-openldap-2.3.24.tgz
-openldap-2.3.27.tgz
-openldap-2.3.28.tgz
-openldap-2.3.30.tgz
-openldap-2.3.34.tgz
-openldap-2.3.37.tgz
-openldap-2.3.38.tgz
-openldap-2.4.6.tgz
-openldap-2.3.39.tgz
 openldap-2.4.7.tgz
 db-4.4.20.tar.gz
\ No newline at end of file


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- openldap.spec	22 Feb 2008 10:59:07 -0000	1.118
+++ openldap.spec	29 Feb 2008 08:40:16 -0000	1.119
@@ -1,4 +1,3 @@
-%define migtools_version 47
 %define db_version 4.4.20
 %define ldbm_backend berkeley
 %define version 2.4.8
@@ -9,12 +8,12 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
 Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
-Source2: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz
+Source3: README.migration
 Source4: ldap.init
 Source5: migration-tools.txt
 Source6: autofs.schema
@@ -37,16 +36,6 @@
 # Patches for the evolution library
 Patch200: openldap-2.4.6-evolution-ntlm.patch
 
-# Patches for the MigrationTools package
-Patch300: MigrationTools-38-instdir.patch
-Patch301: MigrationTools-36-mktemp.patch
-Patch302: MigrationTools-27-simple.patch
-Patch303: MigrationTools-26-suffix.patch
-Patch304: MigrationTools-46-schema.patch
-Patch305: MigrationTools-45-noaliases.patch
-Patch306: MigrationTools-46-ddp.patch
-Patch307: MigrationTools-46-unique-hosts.patch
-
 # Patches for db4 library
 Patch400: db-4.4.20-1.patch
 Patch401: db-4.4.20-2.patch
@@ -95,8 +84,7 @@
 protocols for accessing directory services (usually phone book style
 information, but other information is possible) over the Internet,
 similar to the way DNS (Domain Name System) information is propagated
-over the Internet. This package contains the slapd server,
-migration scripts, and related files.
+over the Internet. This package contains the slapd server and related files.
 
 %package servers-sql
 Summary: OpenLDAP server SQL support module
@@ -127,7 +115,7 @@
 programs needed for accessing and modifying OpenLDAP directories.
 
 %prep
-%setup -q -c -a 1 -a 2
+%setup -q -c -a 1
 
 pushd db-%{db_version}
 %patch400 -b .patch1
@@ -160,17 +148,6 @@
 %patch200 -p1 -b .evolution-ntlm
 popd
 
-pushd MigrationTools-%{migtools_version}
-%patch300 -p1 -b .instdir
-%patch301 -p1 -b .mktemp
-%patch302 -p1 -b .simple
-%patch303 -p1 -b .suffix
-%patch304 -p1 -b .schema
-%patch305 -p1 -b .noaliases
-%patch306 -p1
-%patch307 -p1
-popd
-
 pushd openldap-%{version}
     for subdir in build-servers build-clients ; do
         mkdir $subdir
@@ -361,18 +338,9 @@
 # Touch the dummy slapd.pem to make rpmbuild happy
 touch $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs/slapd.pem
 
-# Install the padl.com migration tools.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/migration
-install -m 755 MigrationTools-%{migtools_version}/migrate_* \
-    $RPM_BUILD_ROOT%{_datadir}/openldap/migration/
-install -m 644 MigrationTools-%{migtools_version}/README \
-    %SOURCE5 \
-    $RPM_BUILD_ROOT%{_datadir}/openldap/migration/
-cp MigrationTools-%{migtools_version}/README README.migration
-cp %SOURCE5 TOOLS.migration
-
 install -m 644 %SOURCE7 README.upgrading
 install -m 644 %SOURCE8 guide.html
+install -m 644 %SOURCE3 README.migration
 
 # Create the data directory.
 mkdir -p $RPM_BUILD_ROOT/var/lib/ldap
@@ -419,7 +387,6 @@
 chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a
 
 # Remove files which we don't want packaged.
-rm -f $RPM_BUILD_ROOT/%{_datadir}/openldap/migration/*.{instdir,simple,schema,mktemp,suffix,noaliases}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.so*
@@ -537,15 +504,13 @@
 %attr(0755,root,root) %{_libdir}/libldap_r-2.4*.so.*
 %attr(0644,root,root) %{_mandir}/man5/ldif.5*
 %attr(0644,root,root) %{_mandir}/man5/ldap.conf.5*
-%attr(0755,root,root) %dir %{_datadir}/openldap
 
 %files servers
 %defattr(-,root,root)
-%doc README.migration
-%doc TOOLS.migration
 %doc db-%{db_version}/LICENSE.bdb-backend
 %doc README.upgrading
 %doc guide.html
+%doc README.migration
 %doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
 %doc openldap-%{version}/doc/guide/admin/*.gif
 %attr(0644,root,root) %doc DB_CONFIG.example
@@ -555,7 +520,6 @@
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf
 %attr(0640,root,ldap) %config(noreplace) %{_sysconfdir}/openldap/slapd.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/ldap
-%attr(0755,root,root) %dir %{_sysconfdir}/openldap/schema
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/schema/*.schema*
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/schema/*.ldif
 %attr(0755,root,root) %dir %{_sysconfdir}/openldap/schema/redhat
@@ -564,12 +528,6 @@
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0644,root,root) %{_mandir}/man5/slapd*.5*
 %attr(0644,root,root) %{_mandir}/man5/slapo-*.5*
-%attr(0755,root,root) %dir %{_datadir}/openldap/migration
-%attr(0644,root,root) %{_datadir}/openldap/migration/README
-%attr(0644,root,root) %{_datadir}/openldap/migration/*.ph
-%attr(0755,root,root) %{_datadir}/openldap/migration/*.pl
-%attr(0755,root,root) %{_datadir}/openldap/migration/*.sh
-%attr(0644,root,root) %{_datadir}/openldap/migration/*.txt
 %attr(0700,ldap,ldap) %dir /var/lib/ldap
 %attr(0755,ldap,ldap) %dir /var/run/openldap
 %attr(0755,root,root) %{_libdir}/libslapd_db-*.*.so
@@ -603,6 +561,10 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Thu Feb 28 2008 Jan Safranek <jsafranek at redhat.com> 2.4.8-2
+- migration tools carved out to standalone package "migrationtools"
+  (#236697)
+
 * Fri Feb 22 2008 Jan Safranek <jsafranek at redhat.com> 2.4.8-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	22 Feb 2008 10:59:07 -0000	1.40
+++ sources	29 Feb 2008 08:40:16 -0000	1.41
@@ -1,3 +1,2 @@
-3faf83eb8482e55979bda47f1d1e6501  MigrationTools-47.tar.gz
 33851f01b455cca48aa601956de93c6f  db-4.4.20.tar.gz
 5ef2ea680479e0cee13fdf64a4ef548a  openldap-2.4.8.tgz