Attachment 861728 Details for Bug 951511 – SPEC file cleanup

[patch] SPEC file cleanup

samba-spec-cleanup.patch (text/plain), 7.99 KB, created by Simone Caronni on 2014-02-11 09:57:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simone Caronni

Created: 2014-02-11 09:57:23 UTC

Size: 7.99 KB

patch

obsolete

>--- samba.spec.old	2014-02-11 10:52:29.934279542 +0100
>+++ samba.spec	2014-02-11 10:55:45.474695572 +0100
>@@ -70,7 +70,6 @@
> 
> Summary:        Server and Client software to interoperate with Windows machines
> License:        GPLv3+ and LGPLv3+
>-Group:          System Environment/Daemons
> URL:            http://www.samba.org/
> 
> Source0:        samba-%{version}%{pre_release}.tar.xz
>@@ -86,8 +85,6 @@
> Source200: README.dc
> Source201: README.downgrade
> 
>-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>-
> Requires(pre): /usr/sbin/groupadd
> Requires(post): systemd
> Requires(preun): systemd
>@@ -189,7 +186,6 @@
> ### CLIENT
> %package client
> Summary: Samba client programs
>-Group: Applications/System
> Requires: %{name}-common = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
> %if %with_libsmbclient
>@@ -207,7 +203,6 @@
> ### COMMON
> %package common
> Summary: Files used by both Samba servers and clients
>-Group: Applications/System
> Requires: %{name}-libs = %{samba_depver}
> %if %with_libwbclient
> Requires: libwbclient = %{samba_depver}
>@@ -229,7 +224,6 @@
> ### DC
> %package dc
> Summary: Samba AD Domain Controller
>-Group: Applications/System
> Requires: %{name}-libs = %{samba_depver}
> Requires: %{name}-dc-libs = %{samba_depver}
> Requires: %{name}-python = %{samba_depver}
>@@ -243,7 +237,6 @@
> ### DC-LIBS
> %package dc-libs
> Summary: Samba AD Domain Controller Libraries
>-Group: Applications/System
> Requires: %{name}-common = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
> Requires: tdb-tools >= %{libtdb_version}
>@@ -264,7 +257,6 @@
> ### DEVEL
> %package devel
> Summary: Developer tools for Samba libraries
>-Group: Development/Libraries
> Requires: %{name}-libs = %{samba_depver}
> 
> Provides: samba4-devel = %{samba_depver}
>@@ -279,7 +271,6 @@
> %if %{with_vfs_glusterfs}
> %package vfs-glusterfs
> Summary: Samba VFS module for GlusterFS
>-Group: Applications/System
> Requires: glusterfs-api >= 3.4.0.16
> Requires: glusterfs >= 3.4.0.16
> Requires: %{name} = %{epoch}:%{samba_version}-%{release}
>@@ -295,7 +286,6 @@
> ### LIBS
> %package libs
> Summary: Samba libraries
>-Group: Applications/System
> Requires: krb5-libs >= 1.10
> %if %with_libwbclient
> Requires: libwbclient = %{samba_depver}
>@@ -312,7 +302,6 @@
> %if %with_libsmbclient
> %package -n libsmbclient
> Summary: The SMB client library
>-Group: Applications/System
> Requires: %{name}-common = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
> 
>@@ -321,7 +310,6 @@
> 
> %package -n libsmbclient-devel
> Summary: Developer tools for the SMB client library
>-Group: Development/Libraries
> Requires: libsmbclient = %{samba_depver}
> 
> %description -n libsmbclient-devel
>@@ -333,14 +321,12 @@
> %if %with_libwbclient
> %package -n libwbclient
> Summary: The winbind client library
>-Group: Applications/System
> 
> %description -n libwbclient
> The libwbclient package contains the winbind client library from the Samba suite.
> 
> %package -n libwbclient-devel
> Summary: Developer tools for the winbind library
>-Group: Development/Libraries
> Requires: libwbclient = %{samba_depver}
> Obsoletes: samba-winbind-devel
> Provides: samba-winbind-devel
>@@ -352,7 +338,6 @@
> ### PYTHON
> %package python
> Summary: Samba Python libraries
>-Group: Applications/System
> Requires: %{name} = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
> Requires: python-tevent
>@@ -370,7 +355,6 @@
> ### PIDL
> %package pidl
> Summary: Perl IDL compiler
>-Group: Development/Tools
> Requires: perl(Parse::Yapp)
> Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
> 
>@@ -384,7 +368,6 @@
> ### TEST
> %package test
> Summary: Testing tools for Samba servers and clients
>-Group: Applications/System
> Requires: %{name} = %{samba_depver}
> Requires: %{name}-common = %{samba_depver}
> %if %with_dc
>@@ -409,7 +392,6 @@
> ### TEST-DEVEL
> %package test-devel
> Summary: Testing devel files for Samba servers and clients
>-Group: Applications/System
> Requires: %{name}-test = %{samba_depver}
> 
> %description test-devel
>@@ -419,7 +401,6 @@
> ### WINBIND
> %package winbind
> Summary: Samba winbind
>-Group: Applications/System
> Requires: %{name}-common = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
> Requires: %{name}-winbind-modules = %{samba_depver}
>@@ -435,7 +416,6 @@
> ### WINBIND-CLIENTS
> %package winbind-clients
> Summary: Samba winbind clients
>-Group: Applications/System
> Requires: %{name}-common = %{samba_depver}
> Requires: %{name}-libs = %{samba_depver}
> Requires: %{name}-winbind = %{samba_depver}
>@@ -453,7 +433,6 @@
> ### WINBIND-KRB5-LOCATOR
> %package winbind-krb5-locator
> Summary: Samba winbind krb5 locator
>-Group: Applications/System
> %if %with_libwbclient
> Requires: libwbclient = %{samba_depver}
> Requires: %{name}-winbind = %{samba_depver}
>@@ -480,7 +459,6 @@
> ### WINBIND-MODULES
> %package winbind-modules
> Summary: Samba winbind modules
>-Group: Applications/System
> Requires: %{name}-libs = %{samba_depver}
> %if %with_libwbclient
> Requires: libwbclient = %{samba_depver}
>@@ -585,7 +563,6 @@
> (cd pidl && %{__perl} Makefile.PL INSTALLDIRS=vendor )
> 
> %install
>-rm -rf %{buildroot}
> make install DESTDIR=%{buildroot}
> 
> install -d -m 0755 %{buildroot}/usr/{sbin,bin}
>@@ -769,12 +746,8 @@
> 
> %postun winbind-modules -p /sbin/ldconfig
> 
>-%clean
>-rm -rf %{buildroot}
>-
> ### SAMBA
> %files
>-%defattr(-,root,root,-)
> %doc COPYING README WHATSNEW.txt
> %doc examples/autofs examples/LDAP examples/misc
> %doc examples/printer-accounting examples/printing
>@@ -875,7 +848,6 @@
> 
> ### CLIENT
> %files client
>-%defattr(-,root,root)
> %{_bindir}/cifsdd
> %{_bindir}/dbwrap_tool
> %{_bindir}/nmblookup
>@@ -967,7 +939,6 @@
> 
> ### COMMON
> %files common
>-%defattr(-,root,root)
> #%{_libdir}/samba/charset ???
> %{_prefix}/lib/tmpfiles.d/samba.conf
> %{_bindir}/net
>@@ -1012,7 +983,6 @@
> 
> ### DC
> %files dc
>-%defattr(-,root,root)
> 
> %if %with_dc
> %{_bindir}/samba-tool
>@@ -1087,7 +1057,6 @@
> 
> ### DC-LIBS
> %files dc-libs
>-%defattr(-,root,root)
> %if %with_dc
> %{_libdir}/samba/libprocess_model.so
> %{_libdir}/samba/libservice.so
>@@ -1106,7 +1075,6 @@
> 
> ### DEVEL
> %files devel
>-%defattr(-,root,root)
> %{_includedir}/samba-4.0/charset.h
> %{_includedir}/samba-4.0/core/doserr.h
> %{_includedir}/samba-4.0/core/error.h
>@@ -1277,7 +1245,6 @@
> 
> ### LIBS
> %files libs
>-%defattr(-,root,root)
> %{_libdir}/libdcerpc-atsvc.so.*
> %{_libdir}/libdcerpc-binding.so.*
> %{_libdir}/libdcerpc-samr.so.*
>@@ -1438,13 +1405,11 @@
> ### LIBSMBCLIENT
> %if %with_libsmbclient
> %files -n libsmbclient
>-%defattr(-,root,root)
> %{_libdir}/libsmbclient.so.*
> %{_libdir}/libsmbsharemodes.so.*
> 
> ### LIBSMBCLIENT-DEVEL
> %files -n libsmbclient-devel
>-%defattr(-,root,root)
> %{_includedir}/samba-4.0/libsmbclient.h
> %{_includedir}/samba-4.0/smb_share_modes.h
> %{_libdir}/libsmbclient.so
>@@ -1457,13 +1422,11 @@
> ### LIBWBCLIENT
> %if %with_libwbclient
> %files -n libwbclient
>-%defattr(-,root,root)
> %{_libdir}/libwbclient.so.*
> %{_libdir}/samba/libwinbind-client.so
> 
> ### LIBWBCLIENT-DEVEL
> %files -n libwbclient-devel
>-%defattr(-,root,root)
> %{_includedir}/samba-4.0/wbclient.h
> %{_libdir}/libwbclient.so
> %{_libdir}/pkgconfig/wbclient.pc
>@@ -1471,7 +1434,6 @@
> 
> ### PIDL
> %files pidl
>-%defattr(-,root,root,-)
> %{perl_vendorlib}/Parse/Pidl*
> %{_mandir}/man1/pidl*
> %{_mandir}/man3/Parse::Pidl*
>@@ -1479,12 +1441,10 @@
> 
> ### PYTHON
> %files python
>-%defattr(-,root,root,-)
> %{python_sitearch}/*
> 
> ### TEST
> %files test
>-%defattr(-,root,root)
> %{_bindir}/gentest
> %{_bindir}/locktest
> %{_bindir}/masktest
>@@ -1520,7 +1480,6 @@
> 
> ### WINBIND
> %files winbind
>-%defattr(-,root,root)
> #%{_bindir}/wbinfo3
> %{_libdir}/samba/idmap
> %{_libdir}/samba/nss_info
>@@ -1535,7 +1494,6 @@
> 
> ### WINBIND-CLIENTS
> %files winbind-clients
>-%defattr(-,root,root)
> %{_bindir}/ntlm_auth
> %{_bindir}/wbinfo
> %{_mandir}/man1/ntlm_auth.1.gz
>@@ -1543,14 +1501,12 @@
> 
> ### WINBIND-KRB5-LOCATOR
> %files winbind-krb5-locator
>-%defattr(-,root,root)
> %ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
> %{_libdir}/winbind_krb5_locator.so
> %{_mandir}/man7/winbind_krb5_locator.7*
> 
> ### WINBIND-MODULES
> %files winbind-modules
>-%defattr(-,root,root)
> %{_libdir}/libnss_winbind.so*
> %{_libdir}/libnss_wins.so*
> %{_libdir}/security/pam_winbind.so

Actions: View | Diff

Attachments on bug 951511: 734658 | 734659 | 734675 | 757752 | 861726 | 861728 | 997395 | 997397 | 997411 | 1105572