SPECS: openldap.spec - exchange and system_db bconds to allow stop...

qboosh qboosh at pld-linux.org
Sat Nov 3 01:54:19 CET 2007


Author: qboosh                       Date: Sat Nov  3 00:54:19 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- exchange and system_db bconds to allow stopping this all-private madness
- updated pl
- Obsoletes for removed backend and overlays (in -servers)

---- Files affected:
SPECS:
   openldap.spec (1.266 -> 1.267) 

---- Diffs:

================================================================
Index: SPECS/openldap.spec
diff -u SPECS/openldap.spec:1.266 SPECS/openldap.spec:1.267
--- SPECS/openldap.spec:1.266	Fri Nov  2 22:51:44 2007
+++ SPECS/openldap.spec	Sat Nov  3 01:54:14 2007
@@ -4,13 +4,14 @@
 # - complete & validate descriptions
 # - trigger for removed ldbm backend
 # - trigger for removed overlays (denyop,lastmod)
-# - pl translations for new overlays (call me lazy - baggins)
 #
 # Conditional build:
-%bcond_without	odbc	# disable sql backend
-%bcond_without	perl	# disable perl backend
-%bcond_without	sasl 	# don't build cyrus sasl support
-%bcond_without	slp	# disable SLP support
+%bcond_without	exchange	# hacked version of library for Evolution Exchange support
+%bcond_without	odbc		# disable sql backend
+%bcond_without	perl		# disable perl backend
+%bcond_without	sasl 		# don't build cyrus sasl support
+%bcond_without	slp		# disable SLP support
+%bcond_with	system_db	# system Berkeley DB
 #
 # Never change or update Berkeley DB, it's there to isolate OpenLDAP
 # from any future changes to the system-wide Berkeley DB library.
@@ -64,6 +65,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 %{?with_sasl:BuildRequires:	cyrus-sasl-devel >= 2.1.15}
+%{?with_system_db:BuildRequires:	db-devel >= 4.2}
 BuildRequires:	libltdl-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 1:1.4.2-9
@@ -198,7 +200,7 @@
 Статичні бібліотеки, необхідні для розробки програм, що використовують
 LDAP.
 
-%package	evolution-devel
+%package evolution-devel
 Summary:	LDAP NTLM hack for the evolution-exchange
 Summary(pl.UTF-8):	Hack NTLM dla pakietu evolution-exchange
 Group:		Development/Libraries
@@ -224,7 +226,7 @@
 
 %package ldapc++-devel
 Summary:	LDAPv3 C++ Class Library development files
-Summary(pl.UTF-8):	Pliki dla developerów C++ LDAPv3
+Summary(pl.UTF-8):	Pliki dla programistów C++ LDAPv3
 Group:		Libraries
 Requires:	%{name}-ldapc++ = %{version}-%{release}
 
@@ -232,13 +234,14 @@
 LDAPv3 C++ Class Library development files.
 
 %description ldapc++-devel -l pl.UTF-8
-Pliki dla developerów C++ LDAPv3.
+Pliki dla programistów C++ LDAPv3.
 
 %package ldapc++-static
 Summary:	Static LDAPv3 C++ Class Library
 Summary(pl.UTF-8):	Biblioteka statyczna klas C++ LDAPv3
 Group:		Libraries
 Requires:	%{name}-ldapc++-devel = %{version}-%{release}
+Requires:	libstdc++-devel
 
 %description ldapc++-static
 Static LDAPv3 C++ Class Library.
@@ -443,6 +446,10 @@
 control the add and modify value mods of a modify)
 
 %description overlay-constraint -l pl.UTF-8
+Ta nakładka ogranicza wartości, które można umieszczać w atrybucie,
+ponad limity umieszczone w schemacie. Przechwytuje jedynie polecenia
+dodawania i modyfikowania LDAP (i kontroluje tylko wartości dodawania
+i modyfikowania).
 
 %package overlay-dds
 Summary:	Dynamic Directory Services overlay for OpenLDAP server
@@ -452,11 +459,15 @@
 Requires:	%{name}-servers = %{version}-%{release}
 
 %description overlay-dds
-The dds overlay implements dynamic objects as per RFC 2589.
-The name dds stands for Dynamic Directory Services.  It allows to
-define dynamic objects, characterized by the dynamicObject objectClass.
+The dds overlay implements dynamic objects as per RFC 2589. The name
+dds stands for Dynamic Directory Services. It allows to define dynamic
+objects, characterized by the dynamicObject objectClass.
 
 %description overlay-dds -l pl.UTF-8
+Nakładka dds implementuje obiekty dynamicznie zgodnie z RFC 2589.
+Nazwa dds oznacza Dynamic Directory Services (dynamiczne usługi
+katalogowe). Pozwala definiować obiekty dynamiczne, opisywane przez
+klasę dynamicObject objectClass.
 
 %package overlay-dyngroup
 Summary:	Dyngroup overlay for OpenLDAP server
@@ -502,11 +513,15 @@
 
 %description overlay-memberof
 The memberof overlay allows automatic reverse group membership
-maintenance.  Any time a group entry is modified, its members
+maintenance. Any time a group entry is modified, its members
 are modified as appropriate in order to keep a DN-valued
 "is member of" attribute updated with the DN of the group.
 
 %description overlay-memberof -l pl.UTF-8
+Nakładka memberof pozwala automatycznie utrzymywać odwrotne
+członkostwo grup. Zawsze przy modyfikacji wpisu grupy jej członkowie
+są modyfikowani w odpowiedniej kolejności, aby utrzymać opisany w DN
+atrybut "jest członkiem grupy", uaktualniany wraz z DN grupy.
 
 %package overlay-pcache
 Summary:	Proxy cache overlay for OpenLDAP server
@@ -604,9 +619,11 @@
 Requires:	%{name}-servers = %{version}-%{release}
 
 %description overlay-seqmod
-This overlay serializes concurrent attempts to modify a single entry
+This overlay serializes concurrent attempts to modify a single entry.
 
 %description overlay-seqmod -l pl.UTF-8
+Ta nakładka serializuje jednoczesne próby zmodyfikowania tego samego
+wpisu.
 
 %package overlay-smbk5pwd
 Summary:	smbk5pwd overlay for OpenLDAP server
@@ -616,8 +633,13 @@
 Requires:	%{name}-servers = %{version}-%{release}
 
 %description overlay-smbk5pwd
+smbk5pwd overlay extends the PasswordModify Extended Operation to
+update Kerberos keys and Samba password hashes for an LDAP user.
 
 %description overlay-smbk5pwd -l pl.UTF-8
+Nakładka smbk5pwd rozszerza rozszerzoną operację PasswordModify o
+uaktualnianie kluczy Kerberosa i skrótów haseł Samby dla użytkownika
+LDAP.
 
 %package overlay-syncprov
 Summary:	Syncrepl Provider overlay for OpenLDAP server
@@ -714,7 +736,10 @@
 Requires:	uname(release) >= 2.6
 Provides:	group(slapd)
 Provides:	user(slapd)
+Obsoletes:	openldap-backend-ldbm
+Obsoletes:	openldap-overlay-denyop
 Obsoletes:	openldap-overlay-glue
+Obsoletes:	openldap-overlay-lastmod
 Conflicts:	kernel24
 Conflicts:	kernel24-smp
 # for the posttrans scriptlet, conflicts because in vserver environment rpm package is not installed.
@@ -730,12 +755,10 @@
 openldap-backend package. The bdb backend is recommended.
 
 %description servers -l pl.UTF-8
-Serwery (demony) które przychodzą z LDAPem.
-
-Pakiet ten zawiera:
-- serwer LDAP (slapd)
+Ten pakiet zawiera demona slapd odpowiadającego za obsługę bazy danych
+i zapytania klientów.
 
-Zainstaluj ten pakiet jeżeli potrzebujesz server OpenLDAP-2.x.
+Aby uruchomić serwer OpenLDAP 2.x należy zainstalować ten pakiet.
 
 Potrzebny też jest jakiś backend dla serwera, dlatego należy
 zainstalować odpowiedni pakiet openldap-backend. Zalecany jest backend
@@ -783,8 +806,11 @@
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays/smbk5pwd.c
 cd ..
 
+%if %{without system_db}
 install -d db-%{db_version}/build-rpm
+%endif
 
+%if %{with exchange}
 # Set up a build tree for a static version of libldap with the hooks for the
 # non-standard NTLM bind type which is needed to connect to Win2k GC servers
 # (Win2k3 supports SASL with DIGEST-MD5, so this shouldn't be needed for those
@@ -795,8 +821,10 @@
 fi
 cd evo-%{name}-%{version}
 %patch100 -p0
+%endif
 
 %build
+%if %{without system_db}
 dbdir=`pwd`/db-instroot
 cd db-%{db_version}/build-rpm
 
@@ -807,7 +835,6 @@
 LDFLAGS="%{rpmcflags} %{rpmldflags}"
 export CC CXX CFLAGS CXXFLAGS LDFLAGS
 
-
 ../dist/%configure \
 	--disable-compat185 \
 	--disable-dump185 \
@@ -824,11 +851,19 @@
 	--includedir=${dbdir}/include \
 	--libdir=${dbdir}/%{_lib}
 
-%{__make} libdb_base=libslapd_db libso_base=libslapd_db
-%{__make} install libdb_base=libslapd_db libso_base=libslapd_db strip="false"
+%{__make} \
+	libdb_base=libslapd_db \
+	libso_base=libslapd_db
+%{__make} install \
+	libdb_base=libslapd_db \
+	libso_base=libslapd_db \
+	strip="false"
 ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
 
-cd ../../%{name}-%{version}
+cd ../..
+%endif
+
+cd %{name}-%{version}
 
 CPPFLAGS="-I${dbdir}/include -I/usr/include/ncurses"
 CFLAGS="%{rpmcflags} $CPPFLAGS -D_REENTRANT -fPIC"
@@ -892,10 +927,10 @@
 %{__make} -j1 depend
 %{__make}
 
-mkdir libs
+install -d libs
 for d in liblber libldap libldap_r ; do
-	ln -s ../libraries/$d/.libs/$d.la libs/$d.la
-	ln -s ../libraries/$d/.libs/$d.so libs/$d.so
+	ln -sf ../libraries/$d/.libs/$d.la libs/$d.la
+	ln -sf ../libraries/$d/.libs/$d.so libs/$d.so
 done
 
 __topdir=`pwd`
@@ -908,6 +943,7 @@
 	--with-ldap-includes=$__topdir/include
 %{__make}
 
+%if %{with exchange}
 # Build evolution-specific clients just as we would normal clients,
 # except with a different installation directory in mind
 # and no shared libraries.
@@ -958,6 +994,7 @@
 
 %{__make} -j1 depend
 %{__make}
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -966,21 +1003,26 @@
 	$RPM_BUILD_ROOT%{_datadir}/openldap/schema \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_libdir}}
 
+%if %{with exchange}
 # Install evolution hack first and remove everything but devel stuff
-cd evo-%{name}-%{version}
-%{__make} install \
+%{__make} -C evo-%{name}-%{version} install \
 	DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/openldap,%{_bindir},%{_mandir}}/*
 install %{SOURCE100} $RPM_BUILD_ROOT%{evolution_exchange_prefix}/README.evolution
+%endif
 
-cd ../db-instroot
-install -m755 %{_lib}/libslapd_db-*.*.so $RPM_BUILD_ROOT/%{_libdir}/
+%if %{without system_db}
+cd db-instroot
+install -m755 %{_lib}/libslapd_db-*.*.so $RPM_BUILD_ROOT%{_libdir}
 cd bin
 for binary in db_* ; do
-	install -m755 ${binary} $RPM_BUILD_ROOT/%{_sbindir}/slapd_${binary}
+	install -m755 ${binary} $RPM_BUILD_ROOT%{_sbindir}/slapd_${binary}
 done
 
-cd ../../%{name}-%{version}
+cd ../..
+%endif
+
+cd %{name}-%{version}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -1009,8 +1051,7 @@
 echo "# This is a good place to put your schema definitions " > \
 	$RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/local.schema
 
-cd contrib/ldapc++
-%{__make} install \
+%{__make} -C contrib/ldapc++ install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -1522,6 +1563,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.267  2007/11/03 00:54:14  qboosh
+- exchange and system_db bconds to allow stopping this all-private madness
+- updated pl
+- Obsoletes for removed backend and overlays (in -servers)
+
 Revision 1.266  2007/11/02 21:51:44  baggins
 - fix lib64 in db install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openldap.spec?r1=1.266&r2=1.267&f=u



More information about the pld-cvs-commit mailing list