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

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

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

Revision 1.2 by unnilennium, Thu Mar 2 16:33:57 2017 UTC Revision 1.8 by jpp, Tue May 8 19:39:05 2018 UTC
# Line 1  Line 1 
1  --- samba.spec.original 2016-10-02 16:23:04.356835288 -0700  --- samba.spec.jpp      2018-05-08 18:38:40.163337265 +0200
2  +++ samba.spec  2016-10-02 16:31:38.311833030 -0700  +++ samba.spec  2018-05-08 20:23:54.682747298 +0200
3  @@ -38,1 +38,1 @@  @@ -32,7 +32,7 @@
4     %global with_internal_talloc 0
5     %global with_internal_tevent 0
6     %global with_internal_tdb 0
7  -%global with_internal_ldb 0  -%global with_internal_ldb 0
8  +%global with_internal_ldb 1  +%global with_internal_ldb 1
9  @@ -59,8 +59,8 @@  
10     %global with_profiling 1
11    
12    @@ -56,8 +56,8 @@
13   %global libwbc_alternatives_suffix -64   %global libwbc_alternatives_suffix -64
14   %endif   %endif
15    
# Line 14  Line 20 
20    
21   %if %{with testsuite}   %if %{with testsuite}
22   # The testsuite only works with a full build right now.   # The testsuite only works with a full build right now.
23  @@ -399,2 +399,3 @@  @@ -212,7 +212,7 @@
24   Summary: Samba libraries   BuildRequires: libcephfs1-devel
25   Group: Applications/System   %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  +Requires: libldb  +Requires: libldb
37  @@ -463,7 +464,7 @@   Requires: %{name} = %{samba_depver}
38     Requires: %{name}-libs = %{samba_depver}
39    
40    @@ -499,7 +500,7 @@
41   Requires: %{name}-libs = %{samba_depver}   Requires: %{name}-libs = %{samba_depver}
42   Requires: python-tevent   Requires: python-tevent
43   Requires: python-tdb   Requires: python-tdb
44  -Requires: pyldb  -Requires: pyldb
45  +#Requires: pyldb  +#Requires: pyldb
 +Buildrequires: gnutls-devel  
46   Requires: pytalloc   Requires: pytalloc
47    
48   Provides: samba4-python = %{samba_depver}   Provides: samba4-python = %{samba_depver}
49  @@ -864,8 +865,8 @@  @@ -868,8 +869,8 @@
50   %endif   %endif
51    
52   install -d -m 0755 %{buildroot}%{_unitdir}   install -d -m 0755 %{buildroot}%{_unitdir}
# Line 39  Line 57 
57       install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service       install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
58   done   done
59   %if %with_clustering_support   %if %with_clustering_support
60  @@ -1481,1 +1481,2 @@  @@ -1483,6 +1484,7 @@
61   %{_mandir}/man8/samba-tool.8*   %{_libdir}/samba/ldb/password_hash.so
62     %{_libdir}/samba/ldb/ranged_results.so
63     %{_libdir}/samba/ldb/repl_meta_data.so
64  +%{_unitdir}/samba.service  +%{_unitdir}/samba.service
65   %else # with_dc   %{_libdir}/samba/ldb/resolve_oids.so
66  @@ -1738,6 +1743,7 @@   %{_libdir}/samba/ldb/rootdse.so
67   %{_libdir}/samba/libHDB-SAMBA4-samba4.so   %{_libdir}/samba/ldb/samba3sam.so
68   %{_libdir}/samba/libasn1-samba4.so.8  @@ -1537,7 +1539,6 @@
69   %{_libdir}/samba/libasn1-samba4.so.8.0.0   %{_libdir}/samba/libdfs-server-ad-samba4.so
70  +#%{_libdir}/samba/libdfs_server_ad.so   %{_libdir}/samba/libdnsserver-common-samba4.so
71   %{_libdir}/samba/libgssapi-samba4.so.2   %{_libdir}/samba/libdsdb-module-samba4.so
72   %{_libdir}/samba/libgssapi-samba4.so.2.0.0  -%{_libdir}/samba/libntvfs-samba4.so
73   %{_libdir}/samba/libhcrypto-samba4.so.5   %{_libdir}/samba/bind9/dlz_bind9_9.so
74     %else
75     %doc packaging/README.dc-libs
76    @@ -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

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed