From f886e9d5b04f60ad9b4c896992d7df6d2f2aca5b30ad037bcad3c19ce7c078bf Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Tue, 9 Nov 2010 15:13:38 +0000 Subject: [PATCH] - Surpress gcc warnings about extra format string arguments. - Split-off openldap2-doc (noarch) package (Admin Guide and IDs) OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=54 --- openldap2-client.changes | 6 ++++ openldap2-client.spec | 71 +++++++++++++++++++++++++++++++--------- openldap2.changes | 6 ++++ openldap2.spec | 67 +++++++++++++++++++++++++++++-------- 4 files changed, 122 insertions(+), 28 deletions(-) diff --git a/openldap2-client.changes b/openldap2-client.changes index 4469b69..19f8d76 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 9 15:10:53 UTC 2010 - rhafer@novell.com + +- Surpress gcc warnings about extra format string arguments. +- Split-off openldap2-doc (noarch) package (Admin Guide and IDs) + ------------------------------------------------------------------- Tue Oct 5 14:39:46 UTC 2010 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 6906b0c..241a4af 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client (Version 2.4.23) +# spec file for package openldap2 (Version 2.4.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ %define run_test_suite 1 -Name: openldap2-client +Name: openldap2-client BuildRequires: cyrus-sasl-devel libopenssl-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel @@ -33,16 +33,16 @@ BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -db-devel libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Clients +Group: Productivity/Networking/LDAP/Servers Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP commandline client tools +Summary: The OpenLDAP Server %else Group: Productivity/Networking/LDAP/Clients Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} -Summary: The OpenLDAP commandline client tools +Summary: The OpenLDAP commandline client tools %endif AutoReqProv: on Source: openldap-%{version}.tar.bz2 @@ -79,7 +79,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-perl -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Perl Back-End Requires: openldap2 = %{version} perl = %{perl_version} AutoReqProv: on @@ -96,7 +96,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-meta -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Meta Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -116,7 +116,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-sql -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP SQL Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -130,6 +130,26 @@ to do any programming. Authors: -------- The OpenLDAP Project + +%package -n openldap2-doc +License: BSD3c(or similar) ; openldap 2.8 +Summary: OpenLDAP Documentation +Group: Documentation/Other +AutoReqProv: on +Provides: openldap2:/usr/share/doc/packages/openldap2/drafts/README +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description -n openldap2-doc +The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts + +Authors: +-------- + The OpenLDAP Project + + + %else %description @@ -208,13 +228,12 @@ cd ../openldap-2.3.37 %{?suse_update_config:%{suse_update_config -f build}} libtoolize --force autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" +export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" export STRIP="" %configure \ --localstatedir=/var/run/slapd \ --libexecdir=/usr/lib/openldap \ --enable-wrappers \ - --enable-aclgroups \ --enable-spasswd \ --enable-modules \ --enable-shared \ @@ -305,6 +324,7 @@ 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" +%define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.openldap $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.openldap install -m 644 *.schema $RPM_BUILD_ROOT/etc/openldap/schema @@ -314,6 +334,13 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ install -m 644 SuSEfirewall2.openldap $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/openldap rm -f `find doc/guide ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d` rm -rf doc/guide/release +install -d $RPM_BUILD_ROOT/%{DOCDIR}/adminguide \ + $RPM_BUILD_ROOT/%{DOCDIR}/images \ + $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 doc/guide/admin/* $RPM_BUILD_ROOT/%{DOCDIR}/adminguide +install -m 644 doc/guide/images/*.gif $RPM_BUILD_ROOT/%{DOCDIR}/images +install -m 644 doc/drafts/* $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 ANNOUNCEMENT COPYRIGHT INSTALL LICENSE README CHANGES README.update $RPM_BUILD_ROOT/%{DOCDIR} rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example @@ -367,9 +394,13 @@ cat >openldap2.filelist <>openldap2.filelist < openldap2-back-sql.filelist <openldap2-doc.filelist < %package -n openldap2-back-perl -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Perl Back-End Requires: openldap2 = %{version} perl = %{perl_version} AutoReqProv: on @@ -96,7 +96,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-meta -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP Meta Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -116,7 +116,7 @@ Authors: The OpenLDAP Project %package -n openldap2-back-sql -License: BSD3c(or similar) +License: BSD3c(or similar) ; openldap 2.8 Summary: OpenLDAP SQL Back-End Requires: openldap2 = %{version} AutoReqProv: on @@ -130,6 +130,26 @@ to do any programming. Authors: -------- The OpenLDAP Project + +%package -n openldap2-doc +License: BSD3c(or similar) ; openldap 2.8 +Summary: OpenLDAP Documentation +Group: Documentation/Other +AutoReqProv: on +Provides: openldap2:/usr/share/doc/packages/openldap2/drafts/README +%if 0%{?suse_version} > 1110 +BuildArch: noarch +%endif + +%description -n openldap2-doc +The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts + +Authors: +-------- + The OpenLDAP Project + + + %else %description @@ -208,13 +228,12 @@ cd ../openldap-2.3.37 %{?suse_update_config:%{suse_update_config -f build}} libtoolize --force autoreconf -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" +export CFLAGS="$RPM_OPT_FLAGS -Wno-format-extra-args -fno-strict-aliasing -DLDAP_DEPRECATED -DLDAP_CONNECTIONLESS -DSLAP_CONFIG_DELETE" export STRIP="" %configure \ --localstatedir=/var/run/slapd \ --libexecdir=/usr/lib/openldap \ --enable-wrappers \ - --enable-aclgroups \ --enable-spasswd \ --enable-modules \ --enable-shared \ @@ -305,6 +324,7 @@ 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" +%define DOCDIR %{_defaultdocdir}/%{name} mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 sysconfig.openldap $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.openldap install -m 644 *.schema $RPM_BUILD_ROOT/etc/openldap/schema @@ -314,6 +334,13 @@ install -d $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ install -m 644 SuSEfirewall2.openldap $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/openldap rm -f `find doc/guide ! -name *.html -a ! -name *.gif -a ! -name *.png -a ! -type d` rm -rf doc/guide/release +install -d $RPM_BUILD_ROOT/%{DOCDIR}/adminguide \ + $RPM_BUILD_ROOT/%{DOCDIR}/images \ + $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 doc/guide/admin/* $RPM_BUILD_ROOT/%{DOCDIR}/adminguide +install -m 644 doc/guide/images/*.gif $RPM_BUILD_ROOT/%{DOCDIR}/images +install -m 644 doc/drafts/* $RPM_BUILD_ROOT/%{DOCDIR}/drafts +install -m 644 ANNOUNCEMENT COPYRIGHT INSTALL LICENSE README CHANGES README.update $RPM_BUILD_ROOT/%{DOCDIR} rm -f $RPM_BUILD_ROOT/etc/openldap/DB_CONFIG.example rm -f $RPM_BUILD_ROOT/etc/openldap/schema/README rm -f $RPM_BUILD_ROOT/var/run/slapd/openldap-data/DB_CONFIG.example @@ -367,9 +394,13 @@ cat >openldap2.filelist <>openldap2.filelist < openldap2-back-sql.filelist <openldap2-doc.filelist <