rpms/openldap
7
0
Fork 0
Code Issues Pull Requests Releases Activity

few rpmlint errors fixed

Browse Source
This commit is contained in:
Jan Šafránek 2008-01-24 16:21:26 +00:00
parent d6a9e79666
commit 3ddaa5aaa5
1 changed files with 130 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
openldap.spec
View File

@ -347,8 +347,7 @@ make install DESTDIR=$RPM_BUILD_ROOT \
LIBTOOL="$libtool" \ LIBTOOL="$libtool" \
STRIP="" STRIP=""
install -m644 \ install -m644 %SOURCE9 \
$RPM_SOURCE_DIR/README.evolution \
$RPM_BUILD_ROOT/%{evolution_connector_prefix}/ $RPM_BUILD_ROOT/%{evolution_connector_prefix}/
popd popd
pushd openldap-%{version}/build-clients pushd openldap-%{version}/build-clients
@ -369,10 +368,13 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/migration
install -m 755 MigrationTools-%{migtools_version}/migrate_* \ install -m 755 MigrationTools-%{migtools_version}/migrate_* \
$RPM_BUILD_ROOT%{_datadir}/openldap/migration/ $RPM_BUILD_ROOT%{_datadir}/openldap/migration/
install -m 644 MigrationTools-%{migtools_version}/README \ install -m 644 MigrationTools-%{migtools_version}/README \
$RPM_SOURCE_DIR/migration-tools.txt \ %SOURCE5 \
$RPM_BUILD_ROOT%{_datadir}/openldap/migration/ $RPM_BUILD_ROOT%{_datadir}/openldap/migration/
cp MigrationTools-%{migtools_version}/README README.migration cp MigrationTools-%{migtools_version}/README README.migration
cp $RPM_SOURCE_DIR/migration-tools.txt TOOLS.migration cp %SOURCE5 TOOLS.migration
install -m 644 %SOURCE7 README.upgrading
install -m 644 %SOURCE8 guide.html
# Create the data directory. # Create the data directory.
mkdir -p $RPM_BUILD_ROOT/var/lib/ldap mkdir -p $RPM_BUILD_ROOT/var/lib/ldap
@ -391,16 +393,15 @@ rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/schema/*.default
# Install an init script for the servers. # Install an init script for the servers.
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
install -m 755 $RPM_SOURCE_DIR/ldap.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ldap install -m 755 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ldap
# Install syconfig/ldap # Install syconfig/ldap
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
install -m 644 $RPM_SOURCE_DIR/ldap.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldap install -m 644 %SOURCE10 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ldap
# Add some more schema for the sake of migration scripts. # Add some more schema for the sake of migration scripts.
install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat install -d -m755 $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat
install -m644 \ install -m644 %SOURCE6 \
$RPM_SOURCE_DIR/autofs.schema \
$RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/ $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/
# Move slapd and slurpd out of _libdir # Move slapd and slurpd out of _libdir
@ -541,7 +542,8 @@ fi
%doc README.migration %doc README.migration
%doc TOOLS.migration %doc TOOLS.migration
%doc db-%{db_version}/LICENSE.bdb-backend %doc db-%{db_version}/LICENSE.bdb-backend
%doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/guide.html %doc README.upgrading
%doc guide.html
%doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd %doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd
%doc openldap-%{version}/doc/guide/admin/*.gif %doc openldap-%{version}/doc/guide/admin/*.gif
%ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem
@ -599,71 +601,71 @@ fi
%attr(0644,root,root) %{evolution_connector_libdir}/*.a %attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog %changelog
* Tue Jan 22 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-3%{?dist} * Tue Jan 22 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-3
- obsoleting compat-openldap properly again :) - obsoleting compat-openldap properly again :)
* Tue Jan 22 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-2%{?dist} * Tue Jan 22 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-2
- obsoleting compat-openldap properly (#429591) - obsoleting compat-openldap properly (#429591)
* Mon Jan 14 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-1%{?dist} * Mon Jan 14 2008 Jan Safranek <jsafranek@redhat.com> 2.4.7-1
- new upstream version (openldap-2.4.7) - new upstream version (openldap-2.4.7)
* Mon Dec 3 2007 Jan Safranek <jsafranek@redhat.com> 2.4.6-1%{?dist} * Mon Dec 3 2007 Jan Safranek <jsafranek@redhat.com> 2.4.6-1
- new upstream version (openldap-2.4) - new upstream version (openldap-2.4)
- deprecating compat- package - deprecating compat- package
* Mon Nov 5 2007 Jan Safranek <jsafranek@redhat.com> 2.3.39-1%{?dist} * Mon Nov 5 2007 Jan Safranek <jsafranek@redhat.com> 2.3.39-1
- new upstream release - new upstream release
* Tue Oct 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-4%{?dist} * Tue Oct 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-4
- fixed multilib issues - all platform independent files have the - fixed multilib issues - all platform independent files have the
same content now (#342791) same content now (#342791)
* Thu Oct 4 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-3%{?dist} * Thu Oct 4 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-3
- BDB downgraded back to 4.4.20 because 4.6.18 is not supported by - BDB downgraded back to 4.4.20 because 4.6.18 is not supported by
openldap (#314821) openldap (#314821)
* Mon Sep 17 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-2%{?dist} * Mon Sep 17 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-2
- skeleton /etc/sysconfig/ldap added - skeleton /etc/sysconfig/ldap added
- new SLAPD_LDAP option to turn off listening on ldap:/// (#292591) - new SLAPD_LDAP option to turn off listening on ldap:/// (#292591)
- fixed checking of SSL (#292611) - fixed checking of SSL (#292611)
- fixed upgrade with empty database - fixed upgrade with empty database
* Thu Sep 6 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-1%{?dist} * Thu Sep 6 2007 Jan Safranek <jsafranek@redhat.com> 2.3.38-1
- new upstream version - new upstream version
- added images to the guide.html (#273581) - added images to the guide.html (#273581)
* Wed Aug 22 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-3%{?dist} * Wed Aug 22 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-3
- just rebuild - just rebuild
* Thu Aug 2 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-2%{?dist} * Thu Aug 2 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-2
- do not use specific automake and autoconf - do not use specific automake and autoconf
- do not distinguish between NPTL and non-NPTL platforms, we have NPTL - do not distinguish between NPTL and non-NPTL platforms, we have NPTL
everywhere everywhere
- db-4.6.18 integrated - db-4.6.18 integrated
- updated openldap-servers License: field to reference BDB license - updated openldap-servers License: field to reference BDB license
* Tue Jul 31 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-1%{?dist} * Tue Jul 31 2007 Jan Safranek <jsafranek@redhat.com> 2.3.37-1
- new upstream version - new upstream version
* Fri Jul 20 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-7%{?dist} * Fri Jul 20 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-7
- MigrationTools-47 integrated - MigrationTools-47 integrated
* Wed Jul 4 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-6%{?dist} * Wed Jul 4 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-6
- fix compat-slapcat compilation. Now it can be found in - fix compat-slapcat compilation. Now it can be found in
/usr/lib/compat-openldap/slapcat, because the tool checks argv[0] /usr/lib/compat-openldap/slapcat, because the tool checks argv[0]
(#246581) (#246581)
* Fri Jun 29 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-5%{?dist} * Fri Jun 29 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-5
- smbk5pwd added (#220895) - smbk5pwd added (#220895)
- correctly distribute modules between servers and servers-sql packages - correctly distribute modules between servers and servers-sql packages
* Mon Jun 25 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-4%{?dist} * Mon Jun 25 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-4
- Fix initscript return codes (#242667) - Fix initscript return codes (#242667)
- Provide overlays (as modules; #246036, #245896) - Provide overlays (as modules; #246036, #245896)
- Add available modules to config file - Add available modules to config file
* Tue May 22 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-3%{?dist} * Tue May 22 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-3
- do not create script in /tmp on startup (bz#188298) - do not create script in /tmp on startup (bz#188298)
- add compat-slapcat to openldap-compat (bz#179378) - add compat-slapcat to openldap-compat (bz#179378)
- do not import ddp services with migrate_services.pl - do not import ddp services with migrate_services.pl
@ -674,7 +676,7 @@ fi
- add ldconfig to devel post/postun (bz#240253) - add ldconfig to devel post/postun (bz#240253)
- include misc.schema in default slapd.conf (bz#147805) - include misc.schema in default slapd.conf (bz#147805)
* Mon Apr 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-2%{?dist} * Mon Apr 23 2007 Jan Safranek <jsafranek@redhat.com> 2.3.34-2
- slapadd during package update is now quiet (bz#224581) - slapadd during package update is now quiet (bz#224581)
- use _localstatedir instead of var/ during build (bz#220970) - use _localstatedir instead of var/ during build (bz#220970)
- bind-libbind-devel removed from BuildRequires (bz#216851) - bind-libbind-devel removed from BuildRequires (bz#216851)
@ -684,20 +686,20 @@ fi
- do not strip binaries to produce correct .debuginfo packages - do not strip binaries to produce correct .debuginfo packages
(bz#152516) (bz#152516)
* Mon Feb 19 2007 Jay Fenlason <fenlason<redhat.com> 2.3.34-1%{?dist} * Mon Feb 19 2007 Jay Fenlason <fenlason<redhat.com> 2.3.34-1
- New upstream release - New upstream release
- Upgrade the scripts for migrating the database so that they might - Upgrade the scripts for migrating the database so that they might
actually work. actually work.
- change bind-libbind-devel to bind-devel in BuildPreReq - change bind-libbind-devel to bind-devel in BuildPreReq
* Mon Dec 4 2006 Thomas Woerner <twoerner@redhat.com> 2.3.30-1.1%{?dist} * Mon Dec 4 2006 Thomas Woerner <twoerner@redhat.com> 2.3.30-1.1
- tcp_wrappers has a new devel and libs sub package, therefore changing build - tcp_wrappers has a new devel and libs sub package, therefore changing build
requirement for tcp_wrappers to tcp_wrappers-devel requirement for tcp_wrappers to tcp_wrappers-devel
* Wed Nov 15 2006 Jay Fenlason <fenlason@redhat.com> 2.3.30-1%{?dist} * Wed Nov 15 2006 Jay Fenlason <fenlason@redhat.com> 2.3.30-1
- New upstream version - New upstream version
* Wed Oct 25 2006 Jay Fenlason <fenlason@redhat.com> 2.3.28-1%{?dist} * Wed Oct 25 2006 Jay Fenlason <fenlason@redhat.com> 2.3.28-1
- New upstream version - New upstream version
* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 2.3.27-4 * Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 2.3.27-4
@ -747,7 +749,7 @@ fi
- Modify the -config.patch, ldap.init, and this spec file to put the - Modify the -config.patch, ldap.init, and this spec file to put the
pid file and args file in an ldap-owned openldap subdirectory under pid file and args file in an ldap-owned openldap subdirectory under
/var/run. /var/run.
- Move back_sql* out of %{_sbindir}/openldap , which requires - Move back_sql* out of _sbindir/openldap , which requires
hand-moving slapd and slurpd to _sbindir, and recreating symlinks hand-moving slapd and slurpd to _sbindir, and recreating symlinks
by hand. by hand.
- Retire openldap-2.3.11-ads.patch, which went upstream. - Retire openldap-2.3.11-ads.patch, which went upstream.
@ -818,7 +820,7 @@ fi
* Thu May 19 2005 Nalin Dahyabhai <nalin@redhat.com> 2.2.26-1 * Thu May 19 2005 Nalin Dahyabhai <nalin@redhat.com> 2.2.26-1
- run slaptest with the -u flag if no id2entry db files are found, because - run slaptest with the -u flag if no id2entry db files are found, because
you can't check for read-write access to a non-existent database (#156787) you can't check for read-write access to a non-existent database (#156787)
- add %{_sysconfdir}/openldap/cacerts, which authconfig sets as the - add _sysconfdir/openldap/cacerts, which authconfig sets as the
TLS_CACERTDIR path in /etc/openldap/ldap.conf now TLS_CACERTDIR path in /etc/openldap/ldap.conf now
- use a temporary wrapper script to launch slapd, in case we have arguments - use a temporary wrapper script to launch slapd, in case we have arguments
with embedded whitespace (#158111) with embedded whitespace (#158111)
@ -856,14 +858,14 @@ fi
- update to 2.2.20 (stable-20050103) - update to 2.2.20 (stable-20050103)
- warn about unreadable krb5 keytab files containing "ldap" keys - warn about unreadable krb5 keytab files containing "ldap" keys
- warn about unreadable TLS-related files - warn about unreadable TLS-related files
- own a ref to subdirectories which we create under %%{_libdir}/tls - own a ref to subdirectories which we create under _libdir/tls
* Tue Nov 2 2004 Nalin Dahyabhai <nalin@redhat.com> 2.2.17-0 * Tue Nov 2 2004 Nalin Dahyabhai <nalin@redhat.com> 2.2.17-0
- rebuild - rebuild
* Thu Sep 30 2004 Nalin Dahyabhai <nalin@redhat.com> * Thu Sep 30 2004 Nalin Dahyabhai <nalin@redhat.com>
- update to 2.2.17 (stable-20040923) (#135188) - update to 2.2.17 (stable-20040923) (#135188)
- move nptl libraries into arch-specific subdirectories on %%{ix86} boxes - move nptl libraries into arch-specific subdirectories on x86 boxes
- require a newer glibc which can provide nptl libpthread on i486/i586 - require a newer glibc which can provide nptl libpthread on i486/i586
* Tue Aug 24 2004 Nalin Dahyabhai <nalin@redhat.com> * Tue Aug 24 2004 Nalin Dahyabhai <nalin@redhat.com>
@ -877,8 +879,8 @@ fi
- build a separate, static set of libraries for openldap-devel with the - build a separate, static set of libraries for openldap-devel with the
non-standard ntlm bind patch applied, for use by the evolution-connector non-standard ntlm bind patch applied, for use by the evolution-connector
package (#125579), and installing them under package (#125579), and installing them under
%%{evolution_connector_prefix} (%{evolution_connector_prefix}) evolution_connector_prefix)
- provide openldap-evolution-devel = %%{version}-%%{release} in openldap-devel - provide openldap-evolution-devel = version-release in openldap-devel
so that evolution-connector's source package can require a version of so that evolution-connector's source package can require a version of
openldap-devel which provides what it wants openldap-devel which provides what it wants
@ -1070,7 +1072,7 @@ fi
- update to 2.0.26, db 4.1.24.NC - update to 2.0.26, db 4.1.24.NC
* Fri Sep 13 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.25-2 * Fri Sep 13 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.25-2
- change LD_FLAGS to refer to %{_prefix}/kerberos/%{_lib} instead of - change LD_FLAGS to refer to /usr/kerberos/_libdir instead of
/usr/kerberos/lib, which might not be right on some arches /usr/kerberos/lib, which might not be right on some arches
* Mon Aug 26 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.25-1 * Mon Aug 26 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0.25-1