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

- Remove the empty data dir from the doc package filelist.

Browse Source 
- Explicitly use samba instead of the name macro to define the docbook dir.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=324
This commit is contained in:
Lars Müller 2013-07-05 19:12:59 +00:00 committed by Git OBS Bridge
parent 90b80ac601
commit 35417f7d2e
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:7b57e28339465d52fd319ecfcb116e56101c8dab9d63c8a7c5c83809329f8783 oid sha256:1ca6bd8e5d6219ef608280c2d50878042e30a5038f4cbd570b1b7243100b7ebf
size 38071 size 38021

5
samba-doc.spec
View File

@ -129,7 +129,7 @@ BuildRequires: libtevent-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3034 %define SOURCE_TIMESTAMP 3035
%define BRANCH %{version} %define BRANCH %{version}
Version: 3.6.16 Version: 3.6.16
Release: 0 Release: 0
@ -175,7 +175,7 @@ BuildRequires: ccache
# Define some global directories # Define some global directories
################################ ################################
%define DOCDIR %{_defaultdocdir}/samba %define DOCDIR %{_defaultdocdir}/samba
%define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook %define DOCBOOKDIR %{_defaultdocdir}/samba/docbook
%define LOGDIR %{_localstatedir}/log/samba %define LOGDIR %{_localstatedir}/log/samba
%define LOCKDIR %{_localstatedir}/lib/samba %define LOCKDIR %{_localstatedir}/lib/samba
%define CONFIGDIR %{_sysconfdir}/samba %define CONFIGDIR %{_sysconfdir}/samba
@ -400,7 +400,6 @@ rm -f \
%files -f filelist-samba-doc %files -f filelist-samba-doc
%defattr(-,root,root) %defattr(-,root,root)
%dir %{DOCDIR} %dir %{DOCDIR}
%dir %{_datadir}/samba
%doc %{_datadir}/susehelp %doc %{_datadir}/susehelp
%endif %endif

6
samba.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 5 18:48:26 UTC 2013 - lmuelle@suse.com
- Remove the empty data dir from the doc package filelist.
- Explicitly use samba instead of the name macro to define the docbook dir.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 2 13:39:30 UTC 2013 - ddiss@suse.com Tue Jul 2 13:39:30 UTC 2013 - ddiss@suse.com

5
samba.spec
View File

@ -129,7 +129,7 @@ BuildRequires: libtevent-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3034 %define SOURCE_TIMESTAMP 3035
%define BRANCH %{version} %define BRANCH %{version}
Version: 3.6.16 Version: 3.6.16
Release: 0 Release: 0
@ -182,7 +182,7 @@ BuildRequires: ccache
# Define some global directories # Define some global directories
################################ ################################
%define DOCDIR %{_defaultdocdir}/samba %define DOCDIR %{_defaultdocdir}/samba
%define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook %define DOCBOOKDIR %{_defaultdocdir}/samba/docbook
%define LOGDIR %{_localstatedir}/log/samba %define LOGDIR %{_localstatedir}/log/samba
%define LOCKDIR %{_localstatedir}/lib/samba %define LOCKDIR %{_localstatedir}/lib/samba
%define CONFIGDIR %{_sysconfdir}/samba %define CONFIGDIR %{_sysconfdir}/samba
@ -1562,7 +1562,6 @@ fi
%files doc -f filelist-samba-doc %files doc -f filelist-samba-doc
%defattr(-,root,root) %defattr(-,root,root)
%dir %{DOCDIR} %dir %{DOCDIR}
%dir %{_datadir}/samba
%doc %{_datadir}/susehelp %doc %{_datadir}/susehelp
%endif %endif

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:2ccefb2a0e44277616a0e3b1eab27cf071c0d621edb48ad90d76f242ff1eb644 oid sha256:9325fa7c80957cf1f5174ef49def1a9ea53d2194887290bedb25e3ab1f350a26
size 53620 size 53560