Fix some rpmlitn warnings.

1 files changed, 10 insertions, 18 deletions

diff --git a/samba4.spec b/samba4.spec
index 0b78af5..6419c9c 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -126,7 +126,7 @@ Conflicts: samba-client < 1:%{version}
 Provides: samba-client = %{version}-%{release}
 
 %description client
-The %{name}-client package provides some SMB/CIFS clients to complement
+The samba4-client package provides some SMB/CIFS clients to complement
 the built-in SMB/CIFS filesystem in Linux. These clients allow access
 of SMB/CIFS shares and printing to SMB/CIFS printers.
 
@@ -136,7 +136,7 @@ Group: Applications/System
 Requires: libwbclient
 
 %description libs
-The %{name}-libs package contains the libraries needed by programs that
+The samba4-libs package contains the libraries needed by programs that
 link against the SMB, RPC and other protocols provided by the Samba suite.
 
 %package python
@@ -145,7 +145,7 @@ Group: Applications/System
 Requires: %{name}-libs = %{version}-%{release}
 
 %description python
-The %{name}-python package contains the Python libraries needed by programs
+The samba4-python package contains the Python libraries needed by programs
 that use SMB, RPC and other Samba provided protocols in Python programs.
 
 %package devel
@@ -153,10 +153,11 @@ Summary: Developer tools for Samba libraries
 Group: Development/Libraries
 Requires: %{name}-libs = %{version}-%{release}
 
+Conflicts: samba-devel < 1:%{version}
 Provides: samba-devel = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains the header files for the libraries
+The samba4-devel package contains the header files for the libraries
 needed to develop programs that link against the SMB, RPC and other
 libraries in the Samba suite.
 
@@ -166,7 +167,7 @@ Group: Development/Tools
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description pidl
-The %{name}-pidl package contains the Perl IDL compiler used by Samba
+The samba4-pidl package contains the Perl IDL compiler used by Samba
 and Wireshark to parse IDL and similar protocols
 
 %package common
@@ -178,7 +179,7 @@ Conflicts: samba-common < 1:%{version}
 Provides: samba-common = %{version}-%{release}
 
 %description common
-%{Name}-common provides files necessary for both the server and client
+samba4-common provides files necessary for both the server and client
 packages of Samba.
 
 %package test
@@ -186,7 +187,7 @@ Summary: Testing tools for Samba servers and clients
 Group: Applications/System
 
 %description test
-%{Name}-test provides testing tools for both the server and client
+samba4-test provides testing tools for both the server and client
 packages of Samba.
 
 %package winbind
@@ -289,7 +290,7 @@ Requires: samba4-libs = %{version}-%{release}
 Requires: samba4-common = %{version}-%{release}
 
 %description dc-libs
-The %{name}-dc-libs package contains the libraries needed by the DC to
+The samba4-dc-libs package contains the libraries needed by the DC to
 link against the SMB, RPC and other protocols.
 
 %prep
@@ -340,12 +341,6 @@ link against the SMB, RPC and other protocols.
 	--without-pam_smbpass
 %endif
 
-#        --with-modulesdir=%{_libdir}/{name} \
-#        --with-lockdir=/var/lib/%{name} \
-#        --with-privatedir=/var/lib/%{name}/private \
-#        --sysconfdir=%{_sysconfdir}/%{name} \
-#        --datadir=%{_datadir}/%{name} \
-
 export WAFCACHE=/tmp/wafcache
 mkdir -p $WAFCACHE
 make %{?_smp_mflags}
@@ -400,9 +395,7 @@ install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/samba
 install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/samba/smb.conf
 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
 install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/samba
-#install -m755 %samba_source/script/mksmbpasswd.sh %{buildroot}%{_bindir}
-#install -m644 packaging/Fedora/smbusers %{buildroot}%{_sysconfdir}/samba/smbusers
-#install -m755 packaging/Fedora/smbprint %{buildroot}%{_bindir}
+
 echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/openldap/schema
@@ -432,7 +425,6 @@ rm -f %{buildroot}/%{_mandir}/man3/talloc.3*
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
 rm -f %{buildroot}%{perl_vendorlib}/wscript_build
 rm -rf %{buildroot}%{perl_vendorlib}/Parse/Yapp
-#find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 
 # This makes the right links, as rpmlint requires that
 # the ldconfig-created links be recorded in the RPM.