From d8d313b714f622ee819811999d4d5c9e732ef6b8df86bb038d759397df382647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 9 Sep 2011 13:14:31 +0000 Subject: [PATCH] - Spec file cleanup as suggested by the spec-cleaner tool. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=186 --- build-source-timestamp | 2 +- samba-doc.spec | 94 +++++--- samba.changes | 5 + samba.spec | 513 +++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 323 insertions(+), 295 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index c56feb9..88e3539 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2626 +2627 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index eaf0689..d954f81 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -19,18 +19,34 @@ Name: samba-doc -BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel readline-devel +BuildRequires: cups-devel +BuildRequires: e2fsprogs-devel +BuildRequires: fam-devel +BuildRequires: libacl-devel +BuildRequires: pam-devel +BuildRequires: popt-devel +BuildRequires: readline-devel %if 0%{?suse_version} -BuildRequires: cracklib-devel openldap2-devel +BuildRequires: cracklib-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 -BuildRequires: gdbm-devel pwdutils +BuildRequires: gdbm-devel +BuildRequires: pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel libiniparser-devel libnscd-devel python-devel +BuildRequires: krb5-devel +BuildRequires: libiniparser-devel +BuildRequires: libnscd-devel +BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 -BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-devel xfsprogs-devel +BuildRequires: dmapi-devel +BuildRequires: libnscd-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: xfsprogs-devel +BuildRequires: pkgconfig(libxml-2.0) %endif %if 0%{?suse_version} > 830 && 0%{?suse_version} < 931 BuildRequires: heimdal-devel @@ -39,7 +55,9 @@ BuildRequires: heimdal-devel BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel openldap-devel python-devel +BuildRequires: krb5-devel +BuildRequires: openldap-devel +BuildRequires: python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -80,18 +98,20 @@ BuildRequires: pkgconfig %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif +Version: 3.6.0 +Release: 4 Url: http://www.samba.org/ Version: 3.6.0 Release: 4 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other -AutoReqProv: on +PreReq: coreutils +PreReq: findutils Provides: samba-gplv3-doc = %{version} Obsoletes: samba-gplv3-doc < %{version} Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} -PreReq: coreutils findutils BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -173,8 +193,8 @@ for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \ mv "${file}.new" "${file}" done -%__install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c -%__install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ +install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix test -f vendor-files/tools/package-data && \ . vendor-files/tools/package-data @@ -233,7 +253,7 @@ sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_t %if 0%{?suse_version} > 1110 export SUSE_ASNEEDED=0 %endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if %{use_ccache} export CC="ccache gcc" %endif @@ -299,15 +319,15 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 mkdir -p \ - ${RPM_BUILD_ROOT}/%{DOCDIR} \ - ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ - ${RPM_BUILD_ROOT}/%{SWATDIR}/help \ - ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System + %{buildroot}/%{DOCDIR} \ + %{buildroot}/%{DOCBOOKDIR} \ + %{buildroot}/%{SWATDIR}/help \ + %{buildroot}/%{_datadir}/susehelp/meta/Administration/System # utility scripts scripts="creategroup mksmbpasswd.sh" -%__install -d -m 0755 examples/scripts +install -d -m 0755 examples/scripts for i in $scripts; do - %__install -m 0755 "source3/script/${i}" examples/scripts/${i} + install -m 0755 "source3/script/${i}" examples/scripts/${i} done # configuration files pushd vendor-files @@ -316,10 +336,10 @@ echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.co echo "# samba-doc package is installed." >>config/smb.conf echo "# Date: $( date -I)" >>config/smb.conf grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf -%__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} +install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} # SuSEhelp files -%__install -m 0644 docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop -%__install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html +install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop +install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html popd for file in Samba3-ByExample Samba3-Developers-Guide Samba3-HOWTO; do touch "${RPM_BUILD_ROOT}/%{SWATDIR}/help/${file}" @@ -327,21 +347,21 @@ done cp -a swat/help/welcome.html "${RPM_BUILD_ROOT}/%{SWATDIR}/help" # pam_smbpass is missing cp -a source3/pam_smbpass/samples examples/pam_smbpass -%__install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG -%__install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL -%__install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README -%__install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO -mv COPYING Manifest README Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/ +install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG +install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL +install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README +install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO +mv COPYING Manifest README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ # this is empty rm -rf docs/yodldocs rm -rf docs/manpages -cp -a docs/* ${RPM_BUILD_ROOT}/%{DOCDIR} -rm -rf "${RPM_BUILD_ROOT}/%{DOCBOOKDIR}" -cp -a examples/ ${RPM_BUILD_ROOT}/%{DOCDIR} -test -e "${RPM_BUILD_ROOT}/%{SWATDIR}/help/manpages" || \ - ln -s "%{DOCDIR}/htmldocs/manpages" "${RPM_BUILD_ROOT}/%{SWATDIR}/help" +cp -a docs/* %{buildroot}/%{DOCDIR} +rm -rf "%{buildroot}/%{DOCBOOKDIR}" +cp -a examples/ %{buildroot}/%{DOCDIR} +test -e "%{buildroot}/%{SWATDIR}/help/manpages" || \ + ln -s "%{DOCDIR}/htmldocs/manpages" "%{buildroot}/%{SWATDIR}/help" # Install HTML pages only in the samba-doc package -pushd ${RPM_BUILD_ROOT}/%{SWATDIR}/help +pushd %{buildroot}/%{SWATDIR}/help for file in $( find -mindepth 1 -maxdepth 1); do file="${file#./}" case "${file}" in @@ -361,18 +381,18 @@ for file in $( find -mindepth 1 -maxdepth 1); do done popd # finally build filelist-samba-doc -for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do +for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook - case "${file#${RPM_BUILD_ROOT}}" in + case "${file#%{buildroot}}" in %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; esac - echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" + echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done %if ! %{make_utils} # delete manpages if not packaged in utils-package rm -f \ - ${RPM_BUILD_ROOT}/%{_mandir}/man1/log2pcap.1* \ - ${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1* + %{buildroot}/%{_mandir}/man1/log2pcap.1* \ + %{buildroot}/%{_mandir}/man1/vfstest.1* %endif %endif @@ -414,7 +434,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 2dcead8..cb77752 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 9 13:08:58 UTC 2011 - lmuelle@suse.de + +- Spec file cleanup as suggested by the spec-cleaner tool. + ------------------------------------------------------------------- Thu Sep 8 19:29:36 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 66d45e3..3f6ac88 100644 --- a/samba.spec +++ b/samba.spec @@ -19,18 +19,34 @@ Name: samba -BuildRequires: cups-devel e2fsprogs-devel fam-devel libacl-devel pam-devel popt-devel readline-devel +BuildRequires: cups-devel +BuildRequires: e2fsprogs-devel +BuildRequires: fam-devel +BuildRequires: libacl-devel +BuildRequires: pam-devel +BuildRequires: popt-devel +BuildRequires: readline-devel %if 0%{?suse_version} -BuildRequires: cracklib-devel openldap2-devel +BuildRequires: cracklib-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 -BuildRequires: gdbm-devel pwdutils +BuildRequires: gdbm-devel +BuildRequires: pwdutils %endif %if 0%{?suse_version} > 930 -BuildRequires: krb5-devel libiniparser-devel libnscd-devel python-devel +BuildRequires: krb5-devel +BuildRequires: libiniparser-devel +BuildRequires: libnscd-devel +BuildRequires: python-devel %endif %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031 -BuildRequires: dmapi-devel libnscd-devel libxml2-devel mysql-devel postgresql-devel xfsprogs-devel +BuildRequires: dmapi-devel +BuildRequires: libnscd-devel +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: xfsprogs-devel +BuildRequires: pkgconfig(libxml-2.0) %endif %if 0%{?suse_version} > 830 && 0%{?suse_version} < 931 BuildRequires: heimdal-devel @@ -39,7 +55,9 @@ BuildRequires: heimdal-devel BuildRequires: cracklib-devel %endif %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} -BuildRequires: krb5-devel openldap-devel python-devel +BuildRequires: krb5-devel +BuildRequires: openldap-devel +BuildRequires: python-devel %endif %if 0%{?suse_version} > 1000 BuildRequires: keyutils-devel @@ -80,13 +98,12 @@ BuildRequires: pkgconfig %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define ldapsmb_ver 1.34b -License: GPLv3+ -Group: Productivity/Networking/Samba -Url: http://www.samba.org/ -AutoReqProv: on Version: 3.6.0 Release: 4 +%define ldapsmb_ver 1.34b +License: GPLv3+ +Url: http://www.samba.org/ +Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -94,9 +111,9 @@ Obsoletes: samba-64bit %endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron logrotate +Recommends: cron +Recommends: logrotate %endif -PreReq: coreutils grep /usr/sbin/groupadd /usr/bin/getent Summary: A SMB/CIFS File, Print, and Authentication Server Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 Source1: vendor-files.tar.bz2 @@ -104,6 +121,10 @@ Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 +PreReq: /usr/bin/getent +PreReq: /usr/sbin/groupadd +PreReq: coreutils +PreReq: grep # Choose some features / extra packages here ############################################ %define make_devel 0 @@ -184,22 +205,26 @@ Authors: The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package client License: GPLv3+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba -AutoReqProv: on -Provides: smbfs samba-gplv3-client = %{version} +Provides: samba-gplv3-client = %{version} +Provides: smbfs Obsoletes: samba-gplv3-client < %{version} Provides: samba-client-gplv2 = %{version} Obsoletes: samba-client-gplv2 < %{version} %ifarch ppc64 Obsoletes: samba-client-64bit %endif -PreReq: %{?insserv_prereq} %{?fillup_prereq} coreutils /sbin/chkconfig /sbin/ldconfig +PreReq: %{?fillup_prereq} +PreReq: %{?insserv_prereq} +PreReq: /sbin/chkconfig +PreReq: /sbin/ldconfig +PreReq: coreutils Requires: cifs-utils %description client @@ -224,7 +249,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -233,7 +258,6 @@ Branch : trunk License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ -AutoReqProv: on Provides: samba-gplv3-devel = %{version} Obsoletes: samba-gplv3-devel < %{version} %ifarch ppc64 @@ -251,7 +275,7 @@ Authors: The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %endif @@ -261,12 +285,12 @@ Branch : trunk License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other -AutoReqProv: on +PreReq: coreutils +PreReq: findutils Provides: samba-gplv3-doc = %{version} Obsoletes: samba-gplv3-doc < %{version} Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} -PreReq: coreutils findutils %if 0%{?suse_version} > 1110 BuildArch: noarch %endif @@ -281,7 +305,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %endif @@ -290,12 +314,12 @@ Branch : trunk License: GPLv3+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba -AutoReqProv: on +PreReq: coreutils Provides: samba-gplv3-krb-printing = %{version} Obsoletes: samba-gplv3-krb-printing < %{version} -PreReq: coreutils %if 0%{?suse_version} > 1000 -PreReq: /sbin/conf.d/SuSEconfig.permissions permissions +PreReq: /sbin/conf.d/SuSEconfig.permissions +PreReq: permissions %endif Requires: samba-client >= %{version} @@ -308,7 +332,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %if %{make_utils} @@ -317,7 +341,6 @@ Branch : trunk Summary: debug tools Group: Productivity/Networking/Samba -AutoReqProv: on Provides: samba-gplv3-utils = %{version} Obsoletes: samba-gplv3-utils < %{version} @@ -330,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %endif @@ -339,7 +362,6 @@ Branch : trunk License: GPLv3+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba -AutoReqProv: on Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd @@ -348,9 +370,14 @@ Obsoletes: samba-winbind-64bit %endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 -Recommends: cron logrotate samba-krb-printing +Recommends: cron +Recommends: logrotate +Recommends: samba-krb-printing %endif -PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} /usr/sbin/groupadd +PreReq: %{?insserv_prereq} +PreReq: /sbin/ldconfig +PreReq: /usr/sbin/groupadd +PreReq: coreutils %description winbind This is the winbind-daemon and the wbinfo-tool. @@ -361,7 +388,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -381,21 +408,20 @@ Obsoletes: libsmbclient-64bit %endif Summary: Samba Client Library Group: System/Libraries -AutoReqProv: on PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %endif @@ -415,19 +441,21 @@ Authors: License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ -AutoReqProv: on %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif %if 0%{?suse_version} && 0%{?suse_version} < 921 -Requires: libsmbclient = %{version} heimdal-devel +Requires: heimdal-devel +Requires: libsmbclient = %{version} %else %if 0%{?suse_version} && 0%{?suse_version} < 1031 -Requires: libsmbclient = %{version} krb5-devel +Requires: krb5-devel +Requires: libsmbclient = %{version} %else -Requires: libsmbclient0 = %{version} krb5-devel +Requires: krb5-devel +Requires: libsmbclient0 = %{version} %endif %endif @@ -441,14 +469,13 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libnetapi0 License: GPLv3+ Summary: Samba netapi Library Group: System/Libraries -AutoReqProv: on PreReq: /sbin/ldconfig %description -n libnetapi0 @@ -460,20 +487,19 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libnetapi-devel License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ -AutoReqProv: on %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libnetapi0 = %{version} +Requires: libnetapi0 = %{version} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -485,7 +511,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -500,21 +526,20 @@ License: GPLv3+ %endif Summary: Samba smbsharemodes Library Group: System/Libraries -AutoReqProv: on PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %endif @@ -528,7 +553,6 @@ Authors: License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ -AutoReqProv: on %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -551,14 +575,13 @@ Authors: The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libwbclient0 License: GPLv3+ Summary: Samba libwbclient Library Group: System/Libraries -AutoReqProv: on PreReq: /sbin/ldconfig %description -n libwbclient0 @@ -570,20 +593,19 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libwbclient-devel License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ -AutoReqProv: on %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libwbclient0 = %{version} +Requires: libwbclient0 = %{version} %description -n libwbclient-devel This package contains the static libraries and header files needed to @@ -595,16 +617,15 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libtalloc2 +Version: %{libtalloc_ver} +Release: 4 License: LGPLv3+ Summary: Samba talloc Library Group: System/Libraries -AutoReqProv: on -Version: %{libtalloc_ver} -Release: 4 PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -616,22 +637,21 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libtalloc-devel +Version: %{libtalloc_ver} +Release: 4 License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ -AutoReqProv: on -Version: %{libtalloc_ver} -Release: 4 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libtalloc2 = %{libtalloc_ver} +Requires: libtalloc2 = %{libtalloc_ver} %description -n libtalloc-devel This package contains the static libraries and header files needed to @@ -643,16 +663,15 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libtdb1 +Version: %{libtdb_ver} +Release: 4 License: LGPLv3+ Summary: Samba tdb Library Group: System/Libraries -AutoReqProv: on -Version: %{libtdb_ver} -Release: 4 PreReq: /sbin/ldconfig %description -n libtdb1 @@ -664,18 +683,17 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libtdb-devel +Version: %{libtdb_ver} +Release: 4 License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ -AutoReqProv: on -Version: %{libtdb_ver} -Release: 4 #BuildRequires: pkg-config -Requires: libtdb1 = %{libtdb_ver} +Requires: libtdb1 = %{libtdb_ver} %description -n libtdb-devel This package contains the static libraries and header files needed to @@ -687,16 +705,15 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libtevent0 +Version: %{libtevent_ver} +Release: 4 License: LGPLv3+ Summary: Samba tevent Library Group: System/Libraries -AutoReqProv: on -Version: %{libtevent_ver} -Release: 4 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -708,22 +725,22 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libtevent-devel +Version: %{libtevent_ver} +Release: 4 License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ -AutoReqProv: on -Version: %{libtevent_ver} -Release: 4 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libtalloc-devel libtevent0 = %{libtevent_ver} +Requires: libtalloc-devel +Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel This package contains the static libraries and header files needed to @@ -736,18 +753,17 @@ Authors: The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libldb1 +Version: %{libldb_ver} +Release: 4 License: LGPLv3+ Summary: Samba ldb Library Group: System/Libraries -AutoReqProv: on -Version: %{libldb_ver} -Release: 4 -PreReq: /sbin/ldconfig BuildRequires: popt-devel +PreReq: /sbin/ldconfig %description -n libldb1 This package includes the ldb library. @@ -759,22 +775,22 @@ Authors: The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %package -n libldb-devel +Version: %{libldb_ver} +Release: 4 License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ -AutoReqProv: on -Version: %{libldb_ver} -Release: 4 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else BuildRequires: pkgconfig %endif -Requires: libtalloc-devel libldb1 = %{libldb_ver} +Requires: libldb1 = %{libldb_ver} +Requires: libtalloc-devel %description -n libldb-devel This package contains the static libraries and header files needed to @@ -786,18 +802,17 @@ Authors: -------- The Samba Team -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %if %{make_ldapsmb} %package -n ldapsmb +Version: 1.34b +Release: 306 License: GPLv2+ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba -AutoReqProv: on -Version: 1.34b -Release: 306 Requires: perl-ldap %description -n ldapsmb @@ -810,7 +825,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2626 +Source Timestamp: 2627 Branch : trunk %endif @@ -846,8 +861,8 @@ for file in docs/htmldocs/index.html vendor-files/docu/README.vendor; do sed -e "s/VENDOR/%{VENDOR}/g" "${file}" >"${file}.new" && \ mv "${file}.new" "${file}" done -%__install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c -%__install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ +install -m 0644 vendor-files/tools/get_printing_ticket.c source3/client/get_printing_ticket.c +install -m 0644 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/ # Create and add vendor suffix test -f vendor-files/tools/package-data && \ . vendor-files/tools/package-data @@ -903,7 +918,7 @@ sed -e s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_t %if 0%{?suse_version} > 1110 export SUSE_ASNEEDED=0 %endif -export CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" +export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -DIDMAP_RID_SUPPORT_TRUSTED_DOMAINS" %if %{use_ccache} export CC="ccache gcc" %endif @@ -963,13 +978,13 @@ CONFIGURE_OPTIONS_DEVEL="--enable-debug --enable-developer" %endif ./configure ${CONFIGURE_OPTIONS} ${CONFIGURE_OPTIONS_DEVEL} ./script/mkversion.sh -%{__make} %{build_make_smp_mflags} \ +make %{build_make_smp_mflags} \ all bin/smbfilter %if %{make_ldapsmb} pushd ../ldapsmb-%{ldapsmb_ver} ./autogen.sh rm ldapsmb -%{__make} %{build_make_smp_mflags} all doc +make %{build_make_smp_mflags} all doc popd %endif popd @@ -980,7 +995,7 @@ pushd lib/${lib_dir} --disable-symbol-versions \ --prefix=%{_prefix} \ --libdir=%{_libdir} -%{__make} +make popd done @@ -993,7 +1008,7 @@ TALLOC_LIBS=../../source3/bin/libtalloc.so.2 TALLOC_CFLAGS=-I../talloc/ ./config --sysconfdir=%{CONFIGDIR} \ --libdir=%{_libdir} \ --mandir=%{_mandir} -%{__make} +make popd pushd source4/lib/ldb @@ -1009,13 +1024,13 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include --libdir=%{_libdir} \ --mandir=%{_mandir} \ --with-modulesdir=%{_libdir} -%{__make} +make popd %check for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} -%{__make} test +make test popd done pushd source3 @@ -1031,71 +1046,71 @@ popd %if %{make_devel} export NO_BRP_STRIP_DEBUG="true" %endif -%__install -d -m 0755 -p \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/{if-{down,up}.d,scripts} \ +install -d -m 0755 -p \ + %{buildroot}/%{_sysconfdir}/{pam.d,xinetd.d,logrotate.d} \ + %{buildroot}/%{_sysconfdir}/openldap/schema \ + %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/{if-{down,up}.d,scripts} \ %if 0%{?suse_version} && 0%{?suse_version} > 1020 - ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \ + %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \ %endif - ${RPM_BUILD_ROOT}/%{_sysconfdir}/permissions.d \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/security \ - ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d \ - ${RPM_BUILD_ROOT}/%{CONFIGDIR} \ - ${RPM_BUILD_ROOT}/%{INITDIR} \ - ${RPM_BUILD_ROOT}/%{_lib}/security \ - ${RPM_BUILD_ROOT}/sbin \ - ${RPM_BUILD_ROOT}/%{_includedir} \ - ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig \ - ${RPM_BUILD_ROOT}/%{_libdir}/python/lib-dynload \ - ${RPM_BUILD_ROOT}/%{_libdir}/samba/{config,vfs,rpc,auth,charset,idmap} \ - ${RPM_BUILD_ROOT}/%{_datadir}/omc/svcinfo.d \ - ${RPM_BUILD_ROOT}/%{_datadir}/samba/{LDAP,templates} \ - ${RPM_BUILD_ROOT}/%{_localstatedir}/adm \ - ${RPM_BUILD_ROOT}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles,winbindd_privileged} \ - ${RPM_BUILD_ROOT}/%{LOGDIR} \ - ${RPM_BUILD_ROOT}/%{PIDDIR} \ - ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates \ - ${RPM_BUILD_ROOT}/%{_var}/run \ - ${RPM_BUILD_ROOT}/%{DOCDIR} \ - ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ - ${RPM_BUILD_ROOT}/%{SWATDIR}/help \ - ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System + %{buildroot}/%{_sysconfdir}/permissions.d \ + %{buildroot}/%{_sysconfdir}/security \ + %{buildroot}/%{_sysconfdir}/slp.reg.d \ + %{buildroot}/%{CONFIGDIR} \ + %{buildroot}/%{INITDIR} \ + %{buildroot}/%{_lib}/security \ + %{buildroot}/sbin \ + %{buildroot}/%{_includedir} \ + %{buildroot}/%{_libdir}/pkgconfig \ + %{buildroot}/%{_libdir}/python/lib-dynload \ + %{buildroot}/%{_libdir}/samba/{config,vfs,rpc,auth,charset,idmap} \ + %{buildroot}/%{_datadir}/omc/svcinfo.d \ + %{buildroot}/%{_datadir}/samba/{LDAP,templates} \ + %{buildroot}/%{_localstatedir}/adm \ + %{buildroot}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles,winbindd_privileged} \ + %{buildroot}/%{LOGDIR} \ + %{buildroot}/%{PIDDIR} \ + %{buildroot}/%{_var}/adm/fillup-templates \ + %{buildroot}/%{_var}/run \ + %{buildroot}/%{DOCDIR} \ + %{buildroot}/%{DOCBOOKDIR} \ + %{buildroot}/%{SWATDIR}/help \ + %{buildroot}/%{_datadir}/susehelp/meta/Administration/System for lib_dir in tdb talloc tevent; do pushd lib/${lib_dir} -%{__make} install \ - DESTDIR=${RPM_BUILD_ROOT} +make install \ + DESTDIR=%{buildroot} popd done # libldb -%{__make} -C source4/lib/ldb/ install \ - DESTDIR=${RPM_BUILD_ROOT} \ +make -C source4/lib/ldb/ install \ + DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} # we prefer the s3 binaries of the tdbtools -rm ${RPM_BUILD_ROOT}/%{_bindir}/tdb{backup,dump,restore,tool} -%{__make} -C source3/ install \ - DESTDIR=${RPM_BUILD_ROOT} \ +rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} +make -C source3/ install \ + DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} # libtalloc -#rm ${RPM_BUILD_ROOT}/%{_libdir}/*talloc* -%{__make} -C lib/talloc/ install \ - DESTDIR=${RPM_BUILD_ROOT} \ +#rm %{buildroot}/%{_libdir}/*talloc* +make -C lib/talloc/ install \ + DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} # libtevent -%{__make} -C lib/talloc/ install \ - DESTDIR=${RPM_BUILD_ROOT} \ +make -C lib/talloc/ install \ + DESTDIR=%{buildroot} \ CONFIGDIR=%{CONFIGDIR} -rm -r ${RPM_BUILD_ROOT}/%{python_sitearch} \ - ${RPM_BUILD_ROOT}/%{_libdir}/ldb/lib{t*,p*} \ - ${RPM_BUILD_ROOT}/%{_libdir}/tevent +rm -r %{buildroot}/%{python_sitearch} \ + %{buildroot}/%{_libdir}/ldb/lib{t*,p*} \ + %{buildroot}/%{_libdir}/tevent for file in source3/pkgconfig/*.pc; do - %__install -m 0644 "${file}" ${RPM_BUILD_ROOT}/%{_libdir}/pkgconfig + install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig done # utility scripts scripts="creategroup mksmbpasswd.sh" -%__install -d -m 0755 examples/scripts +install -d -m 0755 examples/scripts for i in $scripts; do - %__install -m 0755 "source3/script/${i}" examples/scripts/${i} + install -m 0755 "source3/script/${i}" examples/scripts/${i} done # configuration files pushd vendor-files @@ -1104,19 +1119,19 @@ echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.co echo "# samba-doc package is installed." >>config/smb.conf echo "# Date: $( date -I)" >>config/smb.conf grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf -%__install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} +install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR} for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do - %__install -m 0644 "config/${file}" ${RPM_BUILD_ROOT}/%{CONFIGDIR}/${file} + install -m 0644 "config/${file}" %{buildroot}/%{CONFIGDIR}/${file} done %if 0%{?suse_version} < 1121 - mv ${RPM_BUILD_ROOT}/%{CONFIGDIR}/cifstab ${RPM_BUILD_ROOT}/%{CONFIGDIR}/smbfstab + mv %{buildroot}/%{CONFIGDIR}/cifstab %{buildroot}/%{CONFIGDIR}/smbfstab %endif section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf) for section in $section_names; do - ../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"${RPM_BUILD_ROOT}/%{_datadir}/samba/templates/default-${section}" || : + ../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"%{buildroot}/%{_datadir}/samba/templates/default-${section}" || : done for file in config/templates/*; do - cp -a "${file}" "${RPM_BUILD_ROOT}/%{_datadir}/samba/templates/" + cp -a "${file}" "%{buildroot}/%{_datadir}/samba/templates/" done # start scripts scriptSuffix="" @@ -1133,9 +1148,9 @@ fi %endif startScripts="smb nmb winbind %{cifs_init_script}" for script in ${startScripts}; do - %__install -m 0755 "init/${script}${scriptSuffix}" \ - "${RPM_BUILD_ROOT}/%{INITDIR}/${script}" - ln -s "%{INITDIR}/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}" + install -m 0755 "init/${script}${scriptSuffix}" \ + "%{buildroot}/%{INITDIR}/${script}" + ln -s "%{INITDIR}/${script}" "%{buildroot}/%{_sbindir}/rc${script}" done for script in ${startScripts}; do SERVICE_NAME=$( echo "${script}" | tr [:lower:] [:upper:]) @@ -1143,38 +1158,38 @@ for script in ${startScripts}; do -e "s#__SERVICE_NAME#${SERVICE_NAME}#g" \ -e "s#__SERVICE_SCRIPT_NAME#${script}#g" \ init/template.xml \ - >"${RPM_BUILD_ROOT}/%{_datadir}/omc/svcinfo.d/${script}.xml" + >"%{buildroot}/%{_datadir}/omc/svcinfo.d/${script}.xml" done -%__install -m 0755 tools/nmbstatus ${RPM_BUILD_ROOT}/%{_bindir}/nmbstatus -pod2man tools/nmbstatus >${RPM_BUILD_ROOT}/%{_mandir}/man1/nmbstatus.1 +install -m 0755 tools/nmbstatus %{buildroot}/%{_bindir}/nmbstatus +pod2man tools/nmbstatus >%{buildroot}/%{_mandir}/man1/nmbstatus.1 # PDF generator -%__install -p -m 0755 tools/smbprngenpdf ${RPM_BUILD_ROOT}/%{_bindir}/smbprngenpdf -touch ${RPM_BUILD_ROOT}/var/run/%{cifs_init_script} -%__install -m 0644 config/swat.xinetd ${RPM_BUILD_ROOT}/%{_sysconfdir}/xinetd.d/swat -%__install -m 0644 config/samba.reg ${RPM_BUILD_ROOT}/%{_sysconfdir}/slp.reg.d/samba.reg +install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf +touch %{buildroot}/var/run/%{cifs_init_script} +install -m 0644 config/swat.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/swat +install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg %if 0%{?suse_version} && 0%{?suse_version} < 921 - %__install -m 0644 config/samba.pamd ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba + install -m 0644 config/samba.pamd %{buildroot}/%{_sysconfdir}/pam.d/samba %else - %__install -m 0644 config/samba.pamd-common ${RPM_BUILD_ROOT}/%{_sysconfdir}/pam.d/samba + install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba %endif -%__install -m 0644 config/dhcp.conf ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf -%__install -m 0644 config/sysconfig.dhcp-samba-client ${RPM_BUILD_ROOT}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client +install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf +install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do - %__install -m 0755 "tools/${script}" "${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}" + install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}" done # Create ghosts for the symlinks for script in 21-dhcpcd-hook-samba 21-%{cifs_init_script} 55-samba-winbindd; do - touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} + touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} done # Install SuSEfirewall2 config files %if 0%{?suse_version} && 0%{?suse_version} > 1020 -%__install -m 0644 config/sysconfig.firewall.netbios-server \ +install -m 0644 config/sysconfig.firewall.netbios-server \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/netbios-server -%__install -m 0644 config/sysconfig.firewall.samba-server \ +install -m 0644 config/sysconfig.firewall.samba-server \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-server %endif %if 0%{?suse_version} && 0%{?suse_version} > 1100 -%__install -m 0644 config/sysconfig.firewall.samba-client \ +install -m 0644 config/sysconfig.firewall.samba-client \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client %endif # Add logrotate settings for nmbd and smbd only on systems newer than 8.1. @@ -1186,71 +1201,71 @@ done LOGROTATE_FILES="samba samba-winbind" %endif for file in ${LOGROTATE_FILES}; do - %__install -m 0644 logrotate/${file} ${RPM_BUILD_ROOT}/%{_sysconfdir}/logrotate.d/${file} + install -m 0644 logrotate/${file} %{buildroot}/%{_sysconfdir}/logrotate.d/${file} rm -f "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" touch "${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file}" echo "%config(noreplace) %{_sysconfdir}/logrotate.d/${file}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-${file} done -%__install -m 0644 docu/README.vendor ${RPM_BUILD_ROOT}/%{DOCDIR}/README.%{VENDOR} +install -m 0644 docu/README.vendor %{buildroot}/%{DOCDIR}/README.%{VENDOR} # SuSEhelp files -%__install -m 0644 docu/Samba.desktop ${RPM_BUILD_ROOT}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop -%__install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html +install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop +install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html popd # libnss_wins.so -%__install -m 0755 nsswitch/libnss_wins.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_wins.so.2 +install -m 0755 nsswitch/libnss_wins.so %{buildroot}/%{_lib}/libnss_wins.so.2 # winbind stuff -%__install -m 0644 examples/pam_winbind/pam_winbind.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security/pam_winbind.conf -%__install -m 0755 nsswitch/libnss_winbind.so ${RPM_BUILD_ROOT}/%{_lib}/libnss_winbind.so.2 +install -m 0644 examples/pam_winbind/pam_winbind.conf %{buildroot}/%{_sysconfdir}/security/pam_winbind.conf +install -m 0755 nsswitch/libnss_winbind.so %{buildroot}/%{_lib}/libnss_winbind.so.2 # smbfilter -%__install -m 0755 source3/bin/smbfilter ${RPM_BUILD_ROOT}/%{_bindir}/smbfilter +install -m 0755 source3/bin/smbfilter %{buildroot}/%{_bindir}/smbfilter # smbget -%__install -m 0755 source3/bin/smbget ${RPM_BUILD_ROOT}/%{_bindir}/smbget +install -m 0755 source3/bin/smbget %{buildroot}/%{_bindir}/smbget # install nsswitch-headers (for squid, etc. #FIXME) -%__install -d -m 0755 \ - ${RPM_BUILD_ROOT}/%{_includedir}/samba/nsswitch \ - ${RPM_BUILD_ROOT}/%{_includedir}/samba/winbindd +install -d -m 0755 \ + %{buildroot}/%{_includedir}/samba/nsswitch \ + %{buildroot}/%{_includedir}/samba/winbindd for file in winbind_client.h winbind_nss_config.h winbind_nss_linux.h; do - %__install -m 0644 "nsswitch/${file}" ${RPM_BUILD_ROOT}/%{_includedir}/samba/nsswitch/${file} + install -m 0644 "nsswitch/${file}" %{buildroot}/%{_includedir}/samba/nsswitch/${file} done for file in winbindd.h winbindd_proto.h; do - %__install -m 0644 "source3/winbindd/${file}" ${RPM_BUILD_ROOT}/%{_includedir}/samba/winbindd/${file} + install -m 0644 "source3/winbindd/${file}" %{buildroot}/%{_includedir}/samba/winbindd/${file} done # install smbtorture and other test-programs %if %{make_utils} -%__install -m 0755 source3/bin/debug2html ${RPM_BUILD_ROOT}/%{_bindir}/debug2html -%__install -m 0755 source3/bin/log2pcap ${RPM_BUILD_ROOT}/%{_bindir}/log2pcap -%__install -m 0755 source3/bin/smbtorture ${RPM_BUILD_ROOT}/%{_bindir}/smbtorture -%__install -m 0755 source3/bin/talloctort ${RPM_BUILD_ROOT}/%{_bindir}/talloctort -%__install -m 0755 source3/bin/msgtest ${RPM_BUILD_ROOT}/%{_bindir}/msgtest -%__install -m 0755 source3/bin/maketest ${RPM_BUILD_ROOT}/%{_bindir}/maketest -%__install -m 0755 source3/bin/locktest ${RPM_BUILD_ROOT}/%{_bindir}/locktest -%__install -m 0755 source3/bin/nsstest ${RPM_BUILD_ROOT}/%{_bindir}/nsstest -%__install -m 0755 source3/bin/vfstest ${RPM_BUILD_ROOT}/%{_bindir}/vfstest +install -m 0755 source3/bin/debug2html %{buildroot}/%{_bindir}/debug2html +install -m 0755 source3/bin/log2pcap %{buildroot}/%{_bindir}/log2pcap +install -m 0755 source3/bin/smbtorture %{buildroot}/%{_bindir}/smbtorture +install -m 0755 source3/bin/talloctort %{buildroot}/%{_bindir}/talloctort +install -m 0755 source3/bin/msgtest %{buildroot}/%{_bindir}/msgtest +install -m 0755 source3/bin/maketest %{buildroot}/%{_bindir}/maketest +install -m 0755 source3/bin/locktest %{buildroot}/%{_bindir}/locktest +install -m 0755 source3/bin/nsstest %{buildroot}/%{_bindir}/nsstest +install -m 0755 source3/bin/vfstest %{buildroot}/%{_bindir}/vfstest %endif %if %{make_ldapsmb} -install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb ${RPM_BUILD_ROOT}/%{_sbindir}/ -cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5 +install -m 0700 ldapsmb-%{ldapsmb_ver}/ldapsmb %{buildroot}/%{_sbindir}/ +cp -a ldapsmb-%{ldapsmb_ver}/ldapsmb.5 %{buildroot}/%{_mandir}/man5 %endif # cups SMB support -mkdir -p ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/ -touch ${RPM_BUILD_ROOT}/%{cups_lib_dir}/backend/smb +mkdir -p %{buildroot}/%{cups_lib_dir}/backend/ +touch %{buildroot}/%{cups_lib_dir}/backend/smb # pam_smbpass is missing cp -a source3/pam_smbpass/samples examples/pam_smbpass -%__install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG -%__install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL -%__install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README -%__install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO -mv COPYING Manifest README Roadmap WHATSNEW.txt ${RPM_BUILD_ROOT}/%{DOCDIR}/ +install -m 0644 source3/pam_smbpass/CHANGELOG examples/pam_smbpass/CHANGELOG +install -m 0644 source3/pam_smbpass/INSTALL examples/pam_smbpass/INSTALL +install -m 0644 source3/pam_smbpass/README examples/pam_smbpass/README +install -m 0644 source3/pam_smbpass/TODO examples/pam_smbpass/TODO +mv COPYING Manifest README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/ # this is empty rm -rf docs/yodldocs rm -rf docs/manpages -cp -a docs/* ${RPM_BUILD_ROOT}/%{DOCDIR} -rm -rf "${RPM_BUILD_ROOT}/%{DOCBOOKDIR}" -cp -a examples/ ${RPM_BUILD_ROOT}/%{DOCDIR} -test -e "${RPM_BUILD_ROOT}/%{SWATDIR}/help/manpages" || \ - ln -s "%{DOCDIR}/htmldocs/manpages" "${RPM_BUILD_ROOT}/%{SWATDIR}/help" +cp -a docs/* %{buildroot}/%{DOCDIR} +rm -rf "%{buildroot}/%{DOCBOOKDIR}" +cp -a examples/ %{buildroot}/%{DOCDIR} +test -e "%{buildroot}/%{SWATDIR}/help/manpages" || \ + ln -s "%{DOCDIR}/htmldocs/manpages" "%{buildroot}/%{SWATDIR}/help" # Install HTML pages only in the samba-doc package -pushd ${RPM_BUILD_ROOT}/%{SWATDIR}/help +pushd %{buildroot}/%{SWATDIR}/help for file in $( find -mindepth 1 -maxdepth 1); do file="${file#./}" case "${file}" in @@ -1270,38 +1285,38 @@ for file in $( find -mindepth 1 -maxdepth 1); do done popd # finally build filelist-samba-doc -for file in $( find ${RPM_BUILD_ROOT}%{DOCDIR} -maxdepth 1); do +for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do # exclude %{DOCDIR}, README, and docbook - case "${file#${RPM_BUILD_ROOT}}" in + case "${file#%{buildroot}}" in %{DOCDIR}|%{DOCDIR}/README.%{VENDOR}|%{DOCDIR}/docbook) continue ;; esac - echo "%doc ${file#${RPM_BUILD_ROOT}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" + echo "%doc ${file#%{buildroot}}" >>"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" done %if ! %{make_utils} # delete manpages if not packaged in utils-package rm -f \ - ${RPM_BUILD_ROOT}/%{_mandir}/man1/log2pcap.1* \ - ${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1* + %{buildroot}/%{_mandir}/man1/log2pcap.1* \ + %{buildroot}/%{_mandir}/man1/vfstest.1* %endif # find pam_winbind language files %find_lang pam_winbind cat pam_winbind.lang >> ${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-winbind %find_lang net -for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ); do - echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba +for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do + echo "${file#%{buildroot}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done # copy the schema -%__install -m 0644 examples/LDAP/samba.schema ${RPM_BUILD_ROOT}/%{_sysconfdir}/openldap/schema/samba3.schema -%__install -m 0644 examples/LDAP/samba-nds.schema ${RPM_BUILD_ROOT}/%{_datadir}/samba/LDAP/samba-nds.schema +install -m 0644 examples/LDAP/samba.schema %{buildroot}/%{_sysconfdir}/openldap/schema/samba3.schema +install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LDAP/samba-nds.schema # Clean up installed doc if we have a noarch doc package %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000 && 0%{?suse_version} < 1120 while read file; do - rm -r "${RPM_BUILD_ROOT}/${file#%* }" + rm -r "%{buildroot}/${file#%* }" done <"${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba-doc" for file in %{_datadir}/susehelp; do - rm -r "${RPM_BUILD_ROOT}/${file}" + rm -r "%{buildroot}/${file}" done -pushd "${RPM_BUILD_ROOT}/%{DOCDIR}" +pushd "%{buildroot}/%{DOCDIR}" for file in $( find . -mindepth 1 -maxdepth 1);do test "${file}" = "./README.%{VENDOR}" && continue rm -r "${file}" @@ -1310,7 +1325,7 @@ popd %endif # Hardlink duplicate files %if 0%{?suse_version} > 1110 -%fdupes ${RPM_BUILD_ROOT} +%fdupes %{buildroot} %endif %pre @@ -1377,41 +1392,29 @@ fi /sbin/ldconfig %{?insserv_cleanup:%{insserv_cleanup}} -%post -n libnetapi0 -/sbin/ldconfig +%post -n libnetapi0 -p /sbin/ldconfig -%postun -n libnetapi0 -/sbin/ldconfig +%postun -n libnetapi0 -p /sbin/ldconfig -%post -n libtalloc2 -/sbin/ldconfig +%post -n libtalloc2 -p /sbin/ldconfig -%postun -n libtalloc2 -/sbin/ldconfig +%postun -n libtalloc2 -p /sbin/ldconfig -%post -n libwbclient0 -/sbin/ldconfig +%post -n libwbclient0 -p /sbin/ldconfig -%postun -n libwbclient0 -/sbin/ldconfig +%postun -n libwbclient0 -p /sbin/ldconfig -%post -n libtdb1 -/sbin/ldconfig +%post -n libtdb1 -p /sbin/ldconfig -%postun -n libtdb1 -/sbin/ldconfig +%postun -n libtdb1 -p /sbin/ldconfig -%post -n libtevent0 -/sbin/ldconfig +%post -n libtevent0 -p /sbin/ldconfig -%postun -n libtevent0 -/sbin/ldconfig +%postun -n libtevent0 -p /sbin/ldconfig -%post -n libldb1 -/sbin/ldconfig +%post -n libldb1 -p /sbin/ldconfig -%postun -n libldb1 -/sbin/ldconfig +%postun -n libldb1 -p /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %pre doc @@ -1508,7 +1511,7 @@ fi /sbin/ldconfig %clean -[ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" +[ x"%{buildroot}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "%{buildroot}" if [ -e ${RPM_SOURCE_DIR}/baselibs.conf -a 0%{?suse_version} -gt 0 -a 0%{?suse_version} -lt 1110 ]; then sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf fi @@ -1710,9 +1713,9 @@ fi %{_datadir}/samba/templates %dir %{DOCDIR} %doc %{DOCDIR}/README.%{VENDOR} -%{_var}/adm/fillup-templates/samba-client-dhcp.conf -%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client -%ghost %{_var}/run/%{cifs_init_script} +%{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf +%{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client +%ghost %{_localstatedir}/run/%{cifs_init_script} %dir %{LOCKDIR} %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e53f92e..5a50f4f 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2131e9e947c013e0fbb1d5858d87bede57713f11d29fe598df274dca4bc88549 -size 51399 +oid sha256:ce8d1ceb6d52fb429cfde058708e889f8cffd07dc3aac63172475305e5207208 +size 51390