rpm/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

- Simplify libxslt build requirement and README.SUSE install.

Browse Source 
- Remove no longer required cleanup steps while populating the build root.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=456
This commit is contained in:
Lars Müller
2015-03-18 18:15:46 +00:00
committed by Git OBS Bridge
parent 6d17664d99
commit 288a5aa738
4 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
samba.spec
View File

@@ -110,12 +110,7 @@ BuildRequires: libtevent-devel
BuildRequires: python-tevent
# to generate the man pages
BuildRequires: docbook-xsl-stylesheets
%if 0%{?centos_version} > 599 || 0%{?fedora_version} > 11 || 0%{?rhel_version} > 599 || 0%{?suse_version} > 0 && 0%{?suse_version} < 1141
BuildRequires: libxslt
%endif
%if 0%{?suse_version} > 1140 && 0%{?suse_version} < 1211
BuildRequires: libxslt1
%endif
%if 0%{?suse_version} > 1210
BuildRequires: dbus-1-devel
BuildRequires: libxslt-tools
@@ -148,7 +143,7 @@ BuildRequires: systemd-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3384
%define SOURCE_TIMESTAMP 3385
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
@@ -1090,10 +1085,6 @@ for patch in $( patches/tools/guards %{guards_symbols} <patches/series); do
done
# vendor-files (config, scripts, tools)
%setup -T -D -a 1 -n samba-%{samba_ver_full} -q
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 -p vendor-files/docu/rfc3454.txt source4/heimdal/lib/wind/
# Create and add vendor suffix
test -f vendor-files/tools/package-data && \
@@ -1373,8 +1364,8 @@ for file in ${LOGROTATE_FILES}; do
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 %{buildroot}/%{DOCDIR}/README.%{VENDOR}
# SuSEhelp files
install -m 0644 docu/README.SUSE %{buildroot}/%{DOCDIR}/
# SUSEhelp files
install -m 0644 docu/Samba.desktop %{buildroot}/%{_datadir}/susehelp/meta/Administration/System/Samba.desktop
install -d -m 0755 -p ../docs/htmldocs
install -m 0644 docu/manpages.html ../docs/htmldocs/manpages.html
@@ -1401,12 +1392,8 @@ 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 README Roadmap WHATSNEW.txt %{buildroot}/%{DOCDIR}/
# this is empty
rm -rf docs/yodldocs
rm -rf docs/manpages
cp -a docs/* %{buildroot}/%{DOCDIR}
rm -rf "%{buildroot}/%{DOCBOOKDIR}"
rm -f examples/VFS/*~
rmdir "%{buildroot}/%{DOCBOOKDIR}"
cp -a examples/ %{buildroot}/%{DOCDIR}
# finally build filelist-samba-doc
for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do