From 1c0049626b11c8c182fe67300f29f982da2d571c Mon Sep 17 00:00:00 2001 From: Jan Šafránek Date: Feb 29 2008 08:40:16 +0000 Subject: migration tools carved out to standalone package "migrationtools" Resolves: #236697 --- diff --git a/.cvsignore b/.cvsignore index 3be751b..49960fd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -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 diff --git a/README.migration b/README.migration new file mode 100644 index 0000000..a09ae1e --- /dev/null +++ b/README.migration @@ -0,0 +1,4 @@ +As from Fedora 9, MigrationTools are shipped as separate package. +Install "migrationtools" package to get them, e.g.: + +yum install migrationtools \ No newline at end of file diff --git a/openldap.spec b/openldap.spec index bbb8025..86849ba 100644 --- a/openldap.spec +++ b/openldap.spec @@ -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 @@ Patch10: openldap-2.4.6-multilib.patch # 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 @@ Protocol) applications and development tools. LDAP is a set of 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 @@ over the Internet. The openldap-clients package contains the client 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 @@ pushd evo-openldap-%{version} %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 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pki/tls/certs # 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 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so* 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 @@ fi %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 @@ fi %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 @@ fi %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 @@ fi %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Thu Feb 28 2008 Jan Safranek 2.4.8-2 +- migration tools carved out to standalone package "migrationtools" + (#236697) + * Fri Feb 22 2008 Jan Safranek 2.4.8-1 - new upstream release diff --git a/sources b/sources index 0ac952c..5c16d7c 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -3faf83eb8482e55979bda47f1d1e6501 MigrationTools-47.tar.gz 33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz 5ef2ea680479e0cee13fdf64a4ef548a openldap-2.4.8.tgz