/[smeserver]/rpms/samba/sme10/samba.spec.patch
ViewVC logotype

Annotation of /rpms/samba/sme10/samba.spec.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.8 - (hide annotations) (download)
Tue May 8 19:39:05 2018 UTC (6 years, 5 months ago) by jpp
Branch: MAIN
CVS Tags: samba-4_6_2-12_4_el7_sme
Changes since 1.7: +18 -21 lines
* Tue May 08 2018 Jean-Philipe Pialasse <tests@pialasse.com> - 4.6.2-12.4.sme
- import 4.6.2-12 [SME: 10429]
- change gnutls-devel >= 3.4.7 to gnutls-devel to allow build
- import to SME the two last upstream releases [SME: 10326]

1 jpp 1.6 --- samba.spec.jpp 2018-05-08 18:38:40.163337265 +0200
2 jpp 1.7 +++ samba.spec 2018-05-08 20:23:54.682747298 +0200
3 jpp 1.6 @@ -32,7 +32,7 @@
4     %global with_internal_talloc 0
5     %global with_internal_tevent 0
6     %global with_internal_tdb 0
7 unnilennium 1.1 -%global with_internal_ldb 0
8     +%global with_internal_ldb 1
9 jpp 1.6
10     %global with_profiling 1
11    
12     @@ -56,8 +56,8 @@
13 unnilennium 1.1 %global libwbc_alternatives_suffix -64
14     %endif
15    
16     -%global with_mitkrb5 1
17     -%global with_dc 0
18     +%global with_mitkrb5 0
19     +%global with_dc 1
20    
21     %if %{with testsuite}
22     # The testsuite only works with a full build right now.
23 jpp 1.6 @@ -212,7 +212,7 @@
24     BuildRequires: libcephfs1-devel
25     %endif
26     %if %{with_dc}
27     -BuildRequires: gnutls-devel >= 3.4.7
28     +BuildRequires: gnutls-devel
29     # Required by samba-tool to run tests
30     BuildRequires: python-crypto
31     %endif
32     @@ -395,6 +395,7 @@
33     %package vfs-cephfs
34     Summary: Samba VFS module for Ceph distributed storage system
35     Requires: libcephfs1
36 unnilennium 1.1 +Requires: libldb
37 jpp 1.6 Requires: %{name} = %{samba_depver}
38     Requires: %{name}-libs = %{samba_depver}
39    
40     @@ -499,7 +500,7 @@
41 unnilennium 1.1 Requires: %{name}-libs = %{samba_depver}
42     Requires: python-tevent
43     Requires: python-tdb
44     -Requires: pyldb
45     +#Requires: pyldb
46     Requires: pytalloc
47    
48     Provides: samba4-python = %{samba_depver}
49 jpp 1.6 @@ -868,8 +869,8 @@
50 unnilennium 1.1 %endif
51    
52     install -d -m 0755 %{buildroot}%{_unitdir}
53     -for i in nmb smb winbind ; do
54     - cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba@g' >tmp$i.service
55     +for i in nmb smb winbind samba; do
56     + cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service
57     install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
58     done
59     %if %with_clustering_support
60 jpp 1.6 @@ -1483,6 +1484,7 @@
61     %{_libdir}/samba/ldb/password_hash.so
62     %{_libdir}/samba/ldb/ranged_results.so
63     %{_libdir}/samba/ldb/repl_meta_data.so
64 unnilennium 1.1 +%{_unitdir}/samba.service
65 jpp 1.6 %{_libdir}/samba/ldb/resolve_oids.so
66     %{_libdir}/samba/ldb/rootdse.so
67     %{_libdir}/samba/ldb/samba3sam.so
68 jpp 1.7 @@ -1537,7 +1539,6 @@
69     %{_libdir}/samba/libdfs-server-ad-samba4.so
70     %{_libdir}/samba/libdnsserver-common-samba4.so
71     %{_libdir}/samba/libdsdb-module-samba4.so
72     -%{_libdir}/samba/libntvfs-samba4.so
73     %{_libdir}/samba/bind9/dlz_bind9_9.so
74     %else
75     %doc packaging/README.dc-libs
76 jpp 1.8 @@ -1503,6 +1503,9 @@
77     %{_libdir}/samba/ldb/tombstone_reanimate.so
78     %{_libdir}/samba/ldb/update_keytab.so
79     %{_libdir}/samba/ldb/wins_ldb.so
80     +%{_libdir}/samba/bind9/dlz_bind9_11.so
81     +%{_libdir}/samba/ldb/dsdb_notification.so
82     +%{_libdir}/samba/ldb/vlv.so
83     %{_libdir}/samba/vfs/posix_eadb.so
84     %dir /var/lib/samba/sysvol
85     %{_datadir}/samba/setup
86     @@ -1539,7 +1542,6 @@
87     %{_libdir}/samba/libdfs-server-ad-samba4.so
88     %{_libdir}/samba/libdnsserver-common-samba4.so
89     %{_libdir}/samba/libdsdb-module-samba4.so
90     -%{_libdir}/samba/libntvfs-samba4.so
91     %{_libdir}/samba/bind9/dlz_bind9_9.so
92     %else
93     %doc packaging/README.dc-libs

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed