git.samba.org / gd / samba-autobuild / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
packaging: Move smbprint to a comman location.
[gd/samba-autobuild/.git] / packaging / RHEL-CTDB / samba.spec.tmpl
diff --git a/packaging/RHEL-CTDB/samba.spec.tmpl b/packaging/RHEL-CTDB/samba.spec.tmpl
index a9111d27bbc961d08b46116defb5df385edb0594..16d2fa43cbb4a22afdb01dc0368c406535a695bf 100644 (file)
--- a/packaging/RHEL-CTDB/samba.spec.tmpl
+++ b/packaging/RHEL-CTDB/samba.spec.tmpl
@@ -46,6 +46,21 @@ BuildRequires: ctdb-devel >= 1.2.25
 
 %define numcpu  %(grep "^processor" /proc/cpuinfo |wc -l | sed -e 's/^0$/1/')
 
+%define with_vfs_gpfs PGPFS_DEFAULT
+%define with_vfs_tsmsm PGPFS_DEFAULT
+
+%if %{with_vfs_tsmsm}
+%define                vfs_tsmsm       ,vfs_tsmsm
+%endif
+
+%if %{with_vfs_gpfs}
+%define                vfs_gpfs        ,vfs_gpfs
+%endif
+
+%define                vfs_modules %{?vfs_gpfs}%{?vfs_tsmsm}
+
+%define                shared_modules idmap_rid,idmap_ad,idmap_tdb2%{vfs_modules}
+
 %description
 Samba is the protocol by which a lot of PC-related machines share
 files, printers, and other information (such as lists of available
@@ -77,35 +92,12 @@ shares and printing to SMB printers.
 Summary: Files used by both Samba servers and clients.
 Group: Applications/System
 Provides: samba-common = %{version}-%{release}
-Requires: libtalloc >= 2.0.1
-Requires: libtdb >= 1.2.6
 
 %description common
 Samba-common provides files necessary for both the server and client
 packages of Samba.
 
 
-#######################################################################
-%package libtdb
-Summary: the tdb library
-Group: Applications/System
-Provides: libtdb = LIBTDBVERSION-%{release}
-Obsoletes: libtdb
-#Conflicts: libtdb < LIBTALLOCVERSION
-
-%description libtdb
-Samba's tdb library.
-
-#######################################################################
-%package libtalloc
-Summary: the talloc library
-Group: Applications/System
-Provides: libtalloc = LIBTALLOCVERSION-%{release}
-Obsoletes: libtalloc
-#Conflicts: libtalloc < LIBTALLOCVERSION
-
-%description libtalloc
-Samba's talloc library
 
 #######################################################################
 %package swat
@@ -160,40 +152,37 @@ export CC
 ## always run autogen.sh
 ./autogen.sh
 
-
 CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./configure \
        --prefix=%{_prefix} \
        --localstatedir=/var \
-        --with-configdir=%{_sysconfdir}/samba \
-        --libdir=%{_libarchdir} \
+       --with-configdir=%{_sysconfdir}/samba \
+       --libdir=%{_libarchdir} \
        --with-modulesdir=%{_libarchdir}/samba \
-       --with-pammodulesdir=%{_libarch}/security \
-        --with-lockdir=/var/lib/samba \
-        --with-logfilebase=/var/log/samba \
-        --mandir=%{_mandir} \
-        --with-piddir=/var/run \
+       --with-pammodulesdir=/%{_libarch}/security \
+       --with-lockdir=/var/lib/samba \
+       --with-logfilebase=/var/log/samba \
+       --mandir=%{_mandir} \
+       --with-piddir=/var/run \
        --with-privatedir=%{_sysconfdir}/samba \
-        --with-sambabook=%{_datadir}/swat/using_samba \
-        --with-swatdir=%{_datadir}/swat \
        --disable-cups \
-        --with-acl-support \
+       --with-acl-support \
        --with-ads \
-        --with-automount \
-        --with-fhs \
+       --with-automount \
+       --enable-fhs \
        --with-pam_smbpass \
        --with-libsmbclient \
        --with-libsmbsharemodes \
-        --without-smbwrapper \
+       --without-smbwrapper \
        --with-pam \
        --with-quotas \
-       --with-shared-modules=idmap_rid,idmap_ad,idmap_tdb2,vfs_gpfs,vfs_tsmsm,vfs_gpfs_hsm_notify \
+       --with-shared-modules=%{shared_modules} \
        --with-syslog \
        --with-utmp \
        --with-cluster-support \
        --with-ctdb=/usr/include \
        --without-ldb \
        --without-dnsupdate \
-       --with-aio-support\
+       --with-aio-support \
        --disable-merged-build \
        --disable-smbtorture4 \
        --disable-external-libtalloc \
@@ -217,7 +206,12 @@ make -j %{numcpu} %{?_smp_mflags} \
 
 # check that desired suppor has been compiled into smbd:
 export LD_LIBRARY_PATH=./bin
-for test in HAVE_POSIX_ACLS HAVE_LDAP HAVE_KRB5 HAVE_GPFS CLUSTER_SUPPORT
+
+HAVE_VARS="HAVE_POSIX_ACLS HAVE_LDAP HAVE_KRB5 CLUSTER_SUPPORT"
+%if %{with_vfs_gpfs}
+       HAVE_VARS="${HAVE_VARS} HAVE_GPFS"
+%endif
+for test in ${HAVE_VARS}
 do
        if ! $(./bin/smbd -b | grep -q $test ) ; then
                echo "ERROR: '$test' is not in smbd. Build stopped."
@@ -237,7 +231,7 @@ find examples docs -type f | xargs -r chmod -x
 rm -rf $RPM_BUILD_ROOT
 
 # Create the target build directory hierarchy
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/swat/{help,include,using_samba/{figs,gifsa}}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/samba/swat/{help,include,using_samba/{figs,gifsa}}
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 mkdir -p $RPM_BUILD_ROOT%{_initrddir}
 mkdir -p $RPM_BUILD_ROOT{%{_libarchdir},%{_includedir}}
@@ -285,6 +279,7 @@ cp -p source3/bin/winbind_krb5_locator.so ${RPM_BUILD_ROOT}/%{_libarchdir}/krb5/
 # remove installed but unpackaged files:
 /bin/rm -f $RPM_BUILD_ROOT/usr/lib*/libtalloc.so
 /bin/rm -f $RPM_BUILD_ROOT/usr/lib*/libtdb.so
+/bin/rm -f $RPM_BUILD_ROOT/usr/lib*/samba/perfcount/pc_test.so
 
 
 # Install the miscellany
@@ -295,7 +290,7 @@ install -m644 setup/samba.sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samb
 install -m755 setup/smb.init $RPM_BUILD_ROOT%{initdir}/smb
 install -m755 setup/winbind.init $RPM_BUILD_ROOT%{initdir}/winbind
 install -m644 setup/samba.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
-install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
+install -m755 packaging/printing/smbprint $RPM_BUILD_ROOT%{_bindir}
 install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
 install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
 install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
@@ -415,8 +410,9 @@ exit 0
 %{_libarchdir}/samba/vfs/fake_perms.so
 %{_libarchdir}/samba/vfs/fileid.so
 %{_libarchdir}/samba/vfs/full_audit.so
+%if %{with_vfs_gpfs}
 %{_libarchdir}/samba/vfs/gpfs.so
-%{_libarchdir}/samba/vfs/gpfs_hsm_notify.so
+%endif
 %{_libarchdir}/samba/vfs/linux_xfs_sgid.so
 %{_libarchdir}/samba/vfs/netatalk.so
 %{_libarchdir}/samba/vfs/preopen.so
@@ -431,9 +427,13 @@ exit 0
 %{_libarchdir}/samba/vfs/streams_xattr.so
 %{_libarchdir}/samba/vfs/syncops.so
 %{_libarchdir}/samba/vfs/time_audit.so
+%if %{with_vfs_tsmsm}
 %{_libarchdir}/samba/vfs/tsmsm.so
+%endif
 %{_libarchdir}/samba/vfs/xattr_tdb.so
-
+%{_libarchdir}/samba/vfs/aio_posix.so
+%{_libarchdir}/samba/vfs/aio_pthread.so
+%{_libarchdir}/samba/vfs/media_harmony.so
 
 %{_mandir}/man1/smbcontrol.1*
 %{_mandir}/man1/smbstatus.1*
@@ -444,9 +444,6 @@ exit 0
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/smbd.8*
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
 %{_mandir}/man8/eventlogadm.8*
 %{_mandir}/man8/vfs_*.8*
 %{_mandir}/man8/smbta-util.8*
@@ -458,7 +455,6 @@ exit 0
 %defattr(-,root,root)
 %doc README
 %doc COPYING
-%doc Manifest 
 %doc WHATSNEW.txt
 %doc Roadmap
 %doc docs-xml/archives/THANKS
@@ -476,11 +472,11 @@ exit 0
 %files swat
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/xinetd.d/swat
-%dir %{_datadir}/swat
-%{_datadir}/swat/*
+%dir %{_datadir}/samba/swat
+%{_datadir}/samba/swat/*
 %{_sbindir}/swat
 %{_mandir}/man8/swat.8*
-%attr(755,root,root) /usr/share/codepages/*.msg
+%attr(755,root,root) %{_datadir}/samba/codepages/*.msg
 
 ##########
 
@@ -514,13 +510,6 @@ exit 0
 
 ##########
 
-%files libtalloc
-%{_libarchdir}/libtalloc.so.LIBTALLOCVERSION
-%{_libarchdir}/libtalloc.so.2
-
-%files libtdb
-%{_libarchdir}/libtdb.so.LIBTDBVERSION
-%{_libarchdir}/libtdb.so.1
 
 %files common
 %defattr(-,root,root)
@@ -542,12 +531,14 @@ exit 0
 %{_libarchdir}/samba/idmap/rid.so
 %{_libarchdir}/samba/idmap/tdb2.so
 %{_libarchdir}/samba/idmap/autorid.so
+%{_libarchdir}/samba/idmap/hash.so
+%{_libarchdir}/samba/nss_info/hash.so
 %{_libarchdir}/samba/nss_info/rfc2307.so
 %{_libarchdir}/samba/nss_info/sfu.so
 %{_libarchdir}/samba/nss_info/sfu20.so
-/usr/share/codepages/lowcase.dat
-/usr/share/codepages/upcase.dat
-/usr/share/codepages/valid.dat
+%{_datadir}/samba/codepages/lowcase.dat
+%{_datadir}/samba/codepages/upcase.dat
+%{_datadir}/samba/codepages/valid.dat
 
 %{_includedir}/libsmbclient.h
 %{_libarchdir}/libsmbclient.*
@@ -557,8 +548,6 @@ exit 0
 
 %{_includedir}/netapi.h
 %{_includedir}/wbclient.h
-%{_includedir}/talloc.h
-%{_includedir}/tdb.h
 %{_libarchdir}/libnetapi.so
 %{_libarchdir}/libnetapi.so.0
 %{_libarchdir}/libwbclient.so
@@ -592,12 +581,6 @@ exit 0
 %{_mandir}/man8/net.8*
 %{_mandir}/man8/pam_winbind.8*
 %{_mandir}/man7/libsmbclient.7*
-%{_mandir}/man1/ldbadd.1*
-%{_mandir}/man1/ldbdel.1*
-%{_mandir}/man1/ldbedit.1*
-%{_mandir}/man1/ldbmodify.1*
-%{_mandir}/man1/ldbsearch.1*
-%{_mandir}/man1/ldbrename.1*
 %{_mandir}/man7/winbind_krb5_locator.7*
 %{_mandir}/man8/idmap_*.8*
 
Unnamed repository; edit this file 'description' to name the repository.