1
0
forked from pool/openldap2

Accepting request 177942 from home:jengelh:branches:network:ldap

- Put static libs into openldap2-devel-static and relieve
  openldap2-devel of static-only deps

OBS-URL: https://build.opensuse.org/request/show/177942
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=98
This commit is contained in:
Ralf Haferkamp 2013-06-14 06:43:36 +00:00 committed by Git OBS Bridge
parent fa1ec2e1a7
commit 49979cff2e
4 changed files with 63 additions and 16 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Mar 25 16:08:21 UTC 2013 - jengelh@inai.de
- Put static libs into openldap2-devel-static and relieve
openldap2-devel of static-only deps
-------------------------------------------------------------------
Sat Nov 17 12:06:23 CET 2012 - ro@suse.de
- fix check-build.sh for kernel > 3.0
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 16 09:52:42 UTC 2012 - rhafer@suse.com Fri Nov 16 09:52:42 UTC 2012 - rhafer@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package openldap2-client # spec file for package openldap2-client
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -137,17 +137,26 @@ Obsoletes: openldap2-devel-64bit
%endif %endif
# #
Conflicts: openldap-devel Conflicts: openldap-devel
Requires: libldap-2_4-2 = %{version}
%description -n openldap2-devel
This package provides the OpenLDAP libraries, header files, and
documentation.
%package -n openldap2-devel-static
Summary: Static libraries for the OpenLDAP libraries
Group: Development/Libraries/C and C++
Requires: openldap2-devel = %version
%if %sles_version == 10 %if %sles_version == 10
Requires: openssl-devel Requires: openssl-devel
%else %else
Requires: libopenssl-devel Requires: libopenssl-devel
%endif %endif
Requires: cyrus-sasl-devel Requires: cyrus-sasl-devel
Requires: libldap-2_4-2 = %{version}
%description -n openldap2-devel %description -n openldap2-devel-static
This package provides the OpenLDAP libraries, header files, and This package provides the static versions of the OpenLDAP libraries
documentation. for development.
%package -n libldap-2_4-2 %package -n libldap-2_4-2
Summary: OpenLDAP Client Libraries Summary: OpenLDAP Client Libraries
@ -413,15 +422,17 @@ cat > libldap.filelist <<EOF
EOF EOF
cat > openldap2-devel.filelist <<EOF cat > openldap2-devel.filelist <<EOF
/usr/include/*.h /usr/include/*.h
%{_libdir}/liblber.a
%{_libdir}/liblber.so %{_libdir}/liblber.so
%{_libdir}/libldap*.a
%{_libdir}/libldap*.so %{_libdir}/libldap*.so
%doc %{_mandir}/man3/ber* %doc %{_mandir}/man3/ber*
%doc %{_mandir}/man3/lber* %doc %{_mandir}/man3/lber*
%doc %{_mandir}/man3/ld_errno* %doc %{_mandir}/man3/ld_errno*
%doc %{_mandir}/man3/ldap* %doc %{_mandir}/man3/ldap*
EOF EOF
cat > openldap2-devel-static.filelist <<-EOF
%_libdir/liblber.a
%_libdir/libldap*.a
EOF
cat > openldap2-back-perl.filelist <<EOF cat > openldap2-back-perl.filelist <<EOF
/usr/lib/openldap/modules/back_perl* /usr/lib/openldap/modules/back_perl*
%doc %{_mandir}/man5/slapd-perl.* %doc %{_mandir}/man5/slapd-perl.*
@ -445,7 +456,8 @@ cat >openldap2-doc.filelist <<EOF
EOF EOF
#remove files from other spec file #remove files from other spec file
%if "%{name}" == "openldap2" %if "%{name}" == "openldap2"
cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist | cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist \
openldap2-devel-static.filelist |
%else %else
cat openldap2.filelist openldap2-back-perl.filelist \ cat openldap2.filelist openldap2-back-perl.filelist \
openldap2-back-meta.filelist openldap2-back-sql.filelist \ openldap2-back-meta.filelist openldap2-back-sql.filelist \
@ -516,6 +528,9 @@ fi
%files -n openldap2-devel -f openldap2-devel.filelist %files -n openldap2-devel -f openldap2-devel.filelist
%defattr(-,root,root) %defattr(-,root,root)
%files -n openldap2-devel-static -f openldap2-devel-static.filelist
%defattr(-,root,root)
%endif %endif
%changelog %changelog

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 16:08:21 UTC 2013 - jengelh@inai.de
- Put static libs into openldap2-devel-static and relieve
openldap2-devel of static-only deps
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 17 12:06:23 CET 2012 - ro@suse.de Sat Nov 17 12:06:23 CET 2012 - ro@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package openldap2 # spec file for package openldap2
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -137,17 +137,26 @@ Obsoletes: openldap2-devel-64bit
%endif %endif
# #
Conflicts: openldap-devel Conflicts: openldap-devel
Requires: libldap-2_4-2 = %{version}
%description -n openldap2-devel
This package provides the OpenLDAP libraries, header files, and
documentation.
%package -n openldap2-devel-static
Summary: Static libraries for the OpenLDAP libraries
Group: Development/Libraries/C and C++
Requires: openldap2-devel = %version
%if %sles_version == 10 %if %sles_version == 10
Requires: openssl-devel Requires: openssl-devel
%else %else
Requires: libopenssl-devel Requires: libopenssl-devel
%endif %endif
Requires: cyrus-sasl-devel Requires: cyrus-sasl-devel
Requires: libldap-2_4-2 = %{version}
%description -n openldap2-devel %description -n openldap2-devel-static
This package provides the OpenLDAP libraries, header files, and This package provides the static versions of the OpenLDAP libraries
documentation. for development.
%package -n libldap-2_4-2 %package -n libldap-2_4-2
Summary: OpenLDAP Client Libraries Summary: OpenLDAP Client Libraries
@ -413,15 +422,17 @@ cat > libldap.filelist <<EOF
EOF EOF
cat > openldap2-devel.filelist <<EOF cat > openldap2-devel.filelist <<EOF
/usr/include/*.h /usr/include/*.h
%{_libdir}/liblber.a
%{_libdir}/liblber.so %{_libdir}/liblber.so
%{_libdir}/libldap*.a
%{_libdir}/libldap*.so %{_libdir}/libldap*.so
%doc %{_mandir}/man3/ber* %doc %{_mandir}/man3/ber*
%doc %{_mandir}/man3/lber* %doc %{_mandir}/man3/lber*
%doc %{_mandir}/man3/ld_errno* %doc %{_mandir}/man3/ld_errno*
%doc %{_mandir}/man3/ldap* %doc %{_mandir}/man3/ldap*
EOF EOF
cat > openldap2-devel-static.filelist <<-EOF
%_libdir/liblber.a
%_libdir/libldap*.a
EOF
cat > openldap2-back-perl.filelist <<EOF cat > openldap2-back-perl.filelist <<EOF
/usr/lib/openldap/modules/back_perl* /usr/lib/openldap/modules/back_perl*
%doc %{_mandir}/man5/slapd-perl.* %doc %{_mandir}/man5/slapd-perl.*
@ -445,7 +456,8 @@ cat >openldap2-doc.filelist <<EOF
EOF EOF
#remove files from other spec file #remove files from other spec file
%if "%{name}" == "openldap2" %if "%{name}" == "openldap2"
cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist | cat openldap2-client.filelist libldap.filelist openldap2-devel.filelist \
openldap2-devel-static.filelist |
%else %else
cat openldap2.filelist openldap2-back-perl.filelist \ cat openldap2.filelist openldap2-back-perl.filelist \
openldap2-back-meta.filelist openldap2-back-sql.filelist \ openldap2-back-meta.filelist openldap2-back-sql.filelist \
@ -516,6 +528,9 @@ fi
%files -n openldap2-devel -f openldap2-devel.filelist %files -n openldap2-devel -f openldap2-devel.filelist
%defattr(-,root,root) %defattr(-,root,root)
%files -n openldap2-devel-static -f openldap2-devel-static.filelist
%defattr(-,root,root)
%endif %endif
%changelog %changelog