- add missed BRs, fix daemon_cflags for amd64, workaround --as-needed breakage.

[packages/autofs.git] / autofs.spec

diff --git a/autofs.spec b/autofs.spec
index 425ca513db4fd0cb02ae28800c363c5812bad09c..2bd33a57bed2530df4a0784e2e4d12649ab23aba 100644 (file)
--- a/autofs.spec
+++ b/autofs.spec
@@ -1,22 +1,22 @@
 # TODO:
 # - change /net to something FHS-compliant ?
-# - upgrade to autofs5 - maybe separate package?
-# - build of ldap-related things has some errors
+# - fix ac/am regeneration
+#
 Summary:       autofs daemon
-Summary(de.UTF-8):   autofs daemon
-Summary(es.UTF-8):   Servidor autofs
-Summary(fr.UTF-8):   démon autofs
-Summary(pl.UTF-8):   Demon autofs
-Summary(pt_BR.UTF-8):   Servidor autofs
-Summary(tr.UTF-8):   autofs sunucu süreci
+Summary(de.UTF-8):     autofs daemon
+Summary(es.UTF-8):     Servidor autofs
+Summary(fr.UTF-8):     démon autofs
+Summary(pl.UTF-8):     Demon autofs
+Summary(pt_BR.UTF-8):  Servidor autofs
+Summary(tr.UTF-8):     autofs sunucu süreci
 Name:          autofs
-Version:       4.1.4
-Release:       4
+Version:       5.0.3
+Release:       0.1
 Epoch:         1
 License:       GPL v2+
 Group:         Daemons
-Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/%{name}-%{version}.tar.bz2
-# Source0-md5: 7e3949114c00665b4636f0c318179657
+Source0:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2
+# Source0-md5: 27839fe6fa8105b2b7d31bc922fd7cf6
 Source1:       %{name}.init
 Source2:       %{name}-auto.master
 Source3:       %{name}-auto.media
@@ -24,15 +24,20 @@ Source4:    %{name}-auto.net
 Source5:       %{name}.sysconfig
 Patch0:                %{name}-open_max.patch
 Patch1:                %{name}-hesiod-includes.patch
-Patch2:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-4.1.4-misc-fixes.patch
-Patch3:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-4.1.4-multi-parse-fix.patch
-Patch4:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-4.1.4-no-unlink-upstream.patch
-Patch5:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-4.1.4-non-replicated-ping.patch
-Patch6:                http://www.kernel.org/pub/linux/daemons/autofs/v4/%{name}-4.1.4-auto.smb-cifs.patch
+## Official patches:
+Patch10:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-ldap-page-control-configure-fix.patch
+Patch11:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-xfn-not-supported.patch
+Patch12:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-basedn-with-spaces-fix-3.patch
+Patch13:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-nfs4-tcp-only.patch
+Patch14:       ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}-correct-ldap-lib.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bind-devel
-BuildRequires: openldap-devel >= 2.3.0
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: krb5-devel
+BuildRequires: libxml2-devel
+BuildRequires: openldap-devel >= 2.4.6
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires:      mktemp
@@ -40,6 +45,7 @@ Requires:     rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/autofs
+%define                filterout_ld    -Wl,--as-needed
 
 %description
 autofs is a daemon which automatically mounts filesystems when you use
@@ -81,8 +87,8 @@ ağ dosya sistemleri, CD-ROM'lar ve disketler üzerinde yapılabilir.
 
 %package ldap
 Summary:       LDAP lookup module for autofs
-Summary(pl.UTF-8):   Moduł LDAP dla autofs
-Summary(pt_BR.UTF-8):   Suporte a mapas LDAP para o pacote autofs
+Summary(pl.UTF-8):     Moduł LDAP dla autofs
+Summary(pt_BR.UTF-8):  Suporte a mapas LDAP para o pacote autofs
 Group:         Daemons
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
@@ -98,22 +104,25 @@ trzymanych na serwerze LDAP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+#Official patches:
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
-chmod a+w configure
-%{__aclocal}
-%{__autoconf}
-%configure
+#%{__aclocal}
+#%{__autoconf}
+export initdir=/etc/rc.d/init.d
+%configure \
+       --with-confdir=%{_sysconfdir}
 
 %{__make} \
        initdir=/etc/rc.d/init.d \
        CC="%{__cc}" \
-       DAEMON_CFLAGS="%{rpmcflags}"
+       DAEMON_CFLAGS="-fPIE %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -176,4 +185,6 @@ fi
 
 %files ldap
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/autofs_ldap_auth.conf
 %attr(755,root,root) %{_libdir}/autofs/lookup_ldap.so
+%attr(755,root,root) %{_libdir}/autofs/lookup_ldaps.so