- 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
This commit is contained in:
Lars Müller
Git OBS Bridge
parent
350c9991ae
commit
d8d313b714
@ -1,2 +1,2 @@
|
||||
2626
|
||||
2627
|
||||
Branch : trunk
|
||||
|
||||
@ -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 <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2626
|
||||
Source Timestamp: 2627
|
||||
Branch : trunk
|
||||
|
||||
%changelog
|
||||
|
||||
@ -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
|
||||
|
||||
|
||||
513
samba.spec
513
samba.spec
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2131e9e947c013e0fbb1d5858d87bede57713f11d29fe598df274dca4bc88549
|
||||
size 51399
|
||||
oid sha256:ce8d1ceb6d52fb429cfde058708e889f8cffd07dc3aac63172475305e5207208
|
||||
size 51390
|
||||
|
||||
Loading…
Reference in New Issue
Block a user