Kolab Groupware OBS

Changes of Revision 5

mozldap.spec Changed

@@ -1,17 +1,10 @@
-%if 0%{?suse_version}
-%define nspr_name       mozilla-nspr
-%else
+# Exclude i686 bit arches
+ExcludeArch: i686
+
 %define nspr_name       nspr
-%endif
 %define nspr_version    4.6
-
-%if 0%{?suse_version}
-%define nss_name        mozilla-nss
-%else
 %define nss_name        nss
-%endif
 %define nss_version     3.11
-
 %define svrcore_name    svrcore
 %define svrcore_version 4.0.3
 
@@ -23,25 +16,21 @@
 Summary:          Mozilla LDAP C SDK
 Name:             mozldap
 Version:          %{major}.%{minor}.%{submin}
-Release:          1%{?dist}
+Release:          25%{?dist}
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 URL:              http://www.mozilla.org/directory/csdk.html
-Group:            System Environment/Libraries
 Requires:         %{nspr_name} >= %{nspr_version}
 Requires:         %{nss_name} >= %{nss_version}
-%if 0%{?suse_version}
-Requires:         lib%{svrcore_name}0 >= %{svrcore_version}
-%else
 Requires:         %{svrcore_name} >= %{svrcore_version}
-%endif
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:    %{nspr_name}-devel >= %{nspr_version}
 BuildRequires:    %{nss_name}-devel >= %{nss_version}
 BuildRequires:    %{svrcore_name}-devel >= %{svrcore_version}
 BuildRequires:    gcc-c++
 BuildRequires:    cyrus-sasl-devel
+BuildRequires:    perl
 
 Source0:          ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{version}/src/%{name}-%{version}.tar.gz
+Patch0:           support-tls1.1-and-later.patch 
 
 %description
 The Mozilla LDAP C SDK is a set of libraries that
@@ -53,7 +42,6 @@
 
 %package tools
 Summary:          Tools for the Mozilla LDAP C SDK
-Group:            System Environment/Base
 Requires:         %{name} = %{version}-%{release}
 BuildRequires:    %{nspr_name}-devel >= %{nspr_version}
 BuildRequires:    %{nss_name}-devel >= %{nss_version}
@@ -67,7 +55,6 @@
 
 %package devel
 Summary:          Development libraries and examples for Mozilla LDAP C SDK
-Group:            Development/Libraries
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{nspr_name}-devel >= %{nspr_version}
 Requires:         %{nss_name}-devel >= %{nss_version}
@@ -79,6 +66,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 cd c-sdk
@@ -136,30 +124,22 @@
 # There is no make install target so we'll do it ourselves.
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_includedir}/%{name}
-%if "%{_libexecdir}" != "%{_libdir}"
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-%endif
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/%{name}
 
 # Copy the binary libraries we want
 for file in libssldap%{libsuffix}.so libprldap%{libsuffix}.so libldap%{libsuffix}.so libldif%{libsuffix}.so
 do
-  %{__install} -m 755 ../dist/lib/$file $RPM_BUILD_ROOT%{_libdir}
+  %{__install} -m 755 $(find c-sdk/ -type f -name "$file") $RPM_BUILD_ROOT%{_libdir}
 done
 
 # Copy the binaries we want
 for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd
 do
-  %{__install} -m 755 ../dist/bin/$file $RPM_BUILD_ROOT%{_libexecdir}/%{name}
-%if "%{_libexecdir}" != "%{_libdir}"
-  pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
-  ln -s ../../..%{_libexecdir}/%{name}/$file $file
-  popd
-%endif
+  %{__install} -m 755 $(find c-sdk/ -type f -name "$file") $RPM_BUILD_ROOT%{_libdir}/%{name}
 done
 
 # Copy the include files
-for file in ../dist/public/ldap/*.h
+for file in c-sdk/ldap/include/*.h
 do
   %{__install} -p -m 644 $file $RPM_BUILD_ROOT%{_includedir}/%{name}
 done
@@ -173,27 +153,11 @@
 %{__install} -m 644 c-sdk/ldap/libraries/libldap/ldapfilter.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
 %{__install} -m 644 c-sdk/ldap/libraries/libldap/ldapsearchprefs.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/etc
 
-%pre
-%if "%{_libexecdir}" != "%{_libdir}"
-for file in ldapsearch ldapmodify ldapdelete ldapcmp ldapcompare ldappasswd; do
-    if [ -f "%{_libdir}/%{name}/${file}" -a ! -L "%{_libdir}/%{name}/${file}" ]; then
-        rm -rf %{_libdir}/%{name}/${file}
-    fi
-done
-%endif
-
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
 
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
-
 %files
-%defattr(-,root,root,-)
 %doc c-sdk/README.rpm
 %{_libdir}/libssldap*.so
 %{_libdir}/libprldap*.so
@@ -201,15 +165,6 @@
 %{_libdir}/libldif*.so
 
 %files tools
-%defattr(-,root,root,-)
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/ldapsearch
-%{_libexecdir}/%{name}/ldapmodify
-%{_libexecdir}/%{name}/ldapdelete
-%{_libexecdir}/%{name}/ldapcmp
-%{_libexecdir}/%{name}/ldapcompare
-%{_libexecdir}/%{name}/ldappasswd
-%if "%{_libexecdir}" != "%{_libdir}"
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/ldapsearch
 %{_libdir}/%{name}/ldapmodify
@@ -217,21 +172,65 @@
 %{_libdir}/%{name}/ldapcmp
 %{_libdir}/%{name}/ldapcompare
 %{_libdir}/%{name}/ldappasswd
-%endif
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}
 %{_datadir}/%{name}
 
 %changelog
-* Sat Apr 07 2018 Christoph Erhardt <kolab@sicherha.de> - 6.0.7-1
-- Bump version to 6.0.7.
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Apr 4 2019 Mark Reynolds <mreynolds@redhat.com> - 6.0.5-24
+- Bump version to 6.0.5-24
+- Add perl build requirement and stop building i686 because of no srvcore
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.5-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 6.0.5-15
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Mon Nov  3 2014 Noriko Hosoi <nhosoi@redhat.com> - 6.0.5-14
+- Disable SSL3
+- Support TLS 1.1 and newer using the NSS Version Range APIs.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
-* Wed Oct 30 2013 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 6.0.5-11
-- Move the commands from a lib_t labeled directory to a bin_t labeled
-  directory.
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild