pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 81727 from network:samba:STABLE

Browse Source 
- Spec file cleanup as suggested by the spec-cleaner tool.
  + Make all BuildRequires, PreReq, and Provides a separate line.
  + Use %{buildroot} instead of ${RPM_BUILD_ROOT}.
  + Use straight commands instead of macros (make, install).
  + Use -p in post and postun if we only call one command.
  + Use %{_localstatedir} instead of %{_var} in the filelist.
  + Remove superfluous AutoReqProv on lines.
- Remove %release from all Provides.
- Fix segfault in iconv.c which caused a null pointer dereference; (bso#8433).
- Use /var/run for the cifs state file in the init script too; (bnc#710304).
- Fix CUPS print job IDs; (bso#7288); (bnc#701257).

OBS-URL: https://build.opensuse.org/request/show/81727
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=102
This commit is contained in:
Lars Vogdt 2011-09-19 13:22:21 +00:00 committed by Git OBS Bridge
commit 34f62e2f19
6 changed files with 366 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-source-timestamp
View File

@ -1,2 +1,2 @@
2622
2630
Branch : trunk

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8519b2358bc4d81cd8b78546d94a8be0afc62237cb9871422294ec2981846a7f
size 50978
oid sha256:a08bdbeb40452084b78a4dde3aba42fb1cf57eaff29a3b0a5deb971ec7fab53a
size 51178

100
samba-doc.spec
View File

@ -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: libxml2-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: xfsprogs-devel
%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: 3
Release: 4
License: GPLv3+
Summary: Samba Documentation
Group: Documentation/Other
AutoReqProv: on
Provides: samba-gplv3-doc = %{version}-%{release}
PreReq: coreutils
PreReq: findutils
Provides: samba-gplv3-doc = %{version}
Obsoletes: samba-gplv3-doc < %{version}
Provides: samba-doc-gplv2 = %{version}-%{release}
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: 2622
Source Timestamp: 2630
Branch : trunk
%changelog

31
samba.changes
View File

@ -1,3 +1,29 @@
-------------------------------------------------------------------
Fri Sep 9 13:08:58 UTC 2011 - lmuelle@suse.de
- Spec file cleanup as suggested by the spec-cleaner tool.
+ Make all BuildRequires, PreReq, and Provides a separate line.
+ Use %{buildroot} instead of ${RPM_BUILD_ROOT}.
+ Use straight commands instead of macros (make, install).
+ Use -p in post and postun if we only call one command.
+ Use %{_localstatedir} instead of %{_var} in the filelist.
+ Remove superfluous AutoReqProv on lines.
-------------------------------------------------------------------
Thu Sep 8 19:29:36 UTC 2011 - lmuelle@suse.de
- Remove %release from all Provides.
-------------------------------------------------------------------
Thu Sep 1 20:54:52 UTC 2011 - lmuelle@suse.de
- Fix segfault in iconv.c which caused a null pointer dereference; (bso#8433).
-------------------------------------------------------------------
Wed Aug 31 16:10:03 UTC 2011 - lmuelle@suse.de
- Use /var/run for the cifs state file in the init script too; (bnc#710304).
-------------------------------------------------------------------
Tue Aug 30 21:38:12 UTC 2011 - lmuelle@suse.de
@ -216,6 +242,11 @@ Tue Jul 26 20:44:01 UTC 2011 - lmuelle@suse.de
affected by a cross-site request forgery; CVE-2011-2522; (bso#8290);
(bnc#705241).
-------------------------------------------------------------------
Wed Jul 20 11:05:27 CEST 2011 - ddiss@suse.de
- Fix CUPS print job IDs; (bso#7288); (bnc#701257).
-------------------------------------------------------------------
Thu Jul 14 10:26:22 UTC 2011 - lmuelle@suse.de

537
samba.spec
View File

File diff suppressed because it is too large Load Diff

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:444a68e70987401082e07817beca1af11559ca194516efa5f6ef5228d3eabe36
size 51460
oid sha256:a2cac10a5cdb2924330646d5b3e166b466b035916bcc90cfc095ef5b16e5ab83
size 51417