From 96b15eb168cda3107e14dd73aebd8e3b99023912624111cc198280a16a065e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Apr 2014 18:44:42 +0000 Subject: [PATCH] Remove superfluous or dead code. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=401 --- samba.spec | 146 ++++++++++++++++++++++++++--------------------------- 1 file changed, 71 insertions(+), 75 deletions(-) diff --git a/samba.spec b/samba.spec index 64e1e13..9a4a6ef 100644 --- a/samba.spec +++ b/samba.spec @@ -15,18 +15,19 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf %endif -BuildRequires: gcc -BuildRequires: make -BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +BuildRequires: gcc +BuildRequires: make +BuildRequires: patch %if 0%{?suse_version} > 1300 BuildRequires: libarchive-devel %endif @@ -45,8 +46,8 @@ BuildRequires: popt-devel BuildRequires: readline-devel %if 0%{?suse_version} BuildRequires: cracklib-devel -BuildRequires: openldap2-devel BuildRequires: libopenssl-devel +BuildRequires: openldap2-devel %endif %if 0%{?suse_version} > 1030 BuildRequires: gdbm-devel @@ -98,8 +99,8 @@ BuildRequires: libtalloc-devel BuildRequires: pytalloc-devel #!BuildIgnore: libtdb BuildRequires: libtdb-devel -BuildRequires: python-tdb BuildRequires: libtevent-devel +BuildRequires: python-tdb BuildRequires: python-tevent # to generate the man pages BuildRequires: docbook-xsl-stylesheets @@ -110,8 +111,8 @@ BuildRequires: libxslt BuildRequires: libxslt1 %endif %if 0%{?suse_version} > 1210 -BuildRequires: libxslt-tools BuildRequires: dbus-1-devel +BuildRequires: libxslt-tools %endif %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline @@ -144,15 +145,13 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3222 +%define SOURCE_TIMESTAMP 3224 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.1.6 Release: 0 -License: GPL-3.0+ Url: http://www.samba.org/ -Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} @@ -161,6 +160,8 @@ Recommends: cron Recommends: logrotate %endif Summary: A SMB/CIFS File, Print, and Authentication Server +License: GPL-3.0+ +Group: Productivity/Networking/Samba Source: %{samba_source_location} Source5: %{samba_source_signature_location} Source6: http://www.samba.org/samba/ftp/samba-pubkey_6568B7EA.asc @@ -250,8 +251,8 @@ Branch: %{BRANCH} %package client -License: GPL-3.0+ Summary: Samba Client Utilities +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-client = %{version} Provides: smbfs @@ -290,8 +291,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package core-devel -License: GPL-3.0+ Summary: Development files shared by Samba subpackages +License: GPL-3.0+ Group: Development/Libraries/C and C++ Conflicts: samba-devel @@ -307,8 +308,8 @@ Branch: %{BRANCH} %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPL-3.0+ Summary: Samba Documentation +License: GPL-3.0+ Group: Documentation/Other PreReq: coreutils PreReq: findutils @@ -330,10 +331,9 @@ Branch: %{BRANCH} %endif - %package libs -License: GPL-3.0+ Summary: Samba libraries +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig @@ -347,8 +347,8 @@ Branch: %{BRANCH} %package pidl -License: GPL-3.0+ Summary: Perl IDL compiler +License: GPL-3.0+ Group: Development/Tools %if 0%{?suse_version} > 0 Requires: perl-base @@ -364,14 +364,14 @@ Branch: %{BRANCH} %package python -License: GPL-3.0+ Summary: Samba Python libraries +License: GPL-3.0+ Group: Applications/System Requires: %{name} = %{version} -Requires: python-tevent -Requires: python-tdb Requires: pyldb Requires: pytalloc +Requires: python-tdb +Requires: python-tevent %description python The samba-python package contains the Python libraries needed by programs @@ -382,8 +382,8 @@ Branch: %{BRANCH} %package test -License: GPL-3.0+ Summary: Testing tools for Samba servers and clients +License: GPL-3.0+ Group: Applications/System Requires: samba = %{version} Requires: samba-winbind = %{version} @@ -398,8 +398,8 @@ Branch: %{BRANCH} %package test-devel -License: GPL-3.0+ Summary: Testing devel files for Samba servers and clients +License: GPL-3.0+ Group: Development/Libraries/C and C++ %description test-devel @@ -411,8 +411,8 @@ Branch: %{BRANCH} %package winbind -License: GPL-3.0+ Summary: Winbind Daemon and Tool +License: GPL-3.0+ Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} @@ -442,8 +442,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc0 -License: GPL-3.0+ Summary: DCE/RPC AT scheduler service library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-atsvc0 @@ -455,8 +455,8 @@ Branch: %{BRANCH} %package -n libdcerpc-atsvc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-atsvc0 = %{version} @@ -472,8 +472,8 @@ Branch: %{BRANCH} %package -n libdcerpc-binding0 -License: GPL-3.0+ Summary: Some samba library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-binding0 @@ -483,8 +483,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr0 -License: GPL-3.0+ Summary: Security Account Manager (SAM) Remote Protocol library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc-samr0 @@ -494,8 +494,8 @@ Branch: %{BRANCH} %package -n libdcerpc-samr-devel -License: GPL-3.0+ Summary: Development files for the SAMR protocol library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libdcerpc-samr0 = %{version} @@ -508,8 +508,8 @@ Branch: %{BRANCH} %package -n libdcerpc0 -License: GPL-3.0+ Summary: Distributed Computing Environment Remote Procedure Calls library +License: GPL-3.0+ Group: System/Libraries %description -n libdcerpc0 @@ -525,11 +525,11 @@ Branch: %{BRANCH} %package -n libdcerpc-devel -License: GPL-3.0+ Summary: Development files for the DCE/RPC library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} Requires: libdcerpc-binding0 = %{version} +Requires: libdcerpc0 = %{version} Requires: samba-core-devel = %{version} %description -n libdcerpc-devel @@ -548,8 +548,8 @@ Branch: %{BRANCH} %package -n libgensec0 -License: GPL-3.0+ Summary: Samba generic security library +License: GPL-3.0+ Group: System/Libraries %description -n libgensec0 @@ -559,8 +559,8 @@ Branch: %{BRANCH} %package -n libgensec-devel -License: GPL-3.0+ Summary: Development files for Samba's generic security library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libgensec0 = %{version} Requires: samba-core-devel = %{version} @@ -574,8 +574,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac0 -License: GPL-3.0+ Summary: NDR marshallers for the KRB5 PAC formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-krb5pac0 @@ -585,8 +585,8 @@ Branch: %{BRANCH} %package -n libndr-krb5pac-devel -License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-krb5pac0 = %{version} Requires: samba-core-devel = %{version} @@ -600,8 +600,8 @@ Branch: %{BRANCH} %package -n libndr-nbt0 -License: GPL-3.0+ Summary: NDR marshallers for NBT formats +License: GPL-3.0+ Group: System/Libraries %description -n libndr-nbt0 @@ -611,8 +611,8 @@ Branch: %{BRANCH} %package -n libndr-nbt-devel -License: GPL-3.0+ Summary: Development files for the ndr-nbt library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-nbt0 = %{version} Requires: samba-core-devel = %{version} @@ -626,8 +626,8 @@ Branch: %{BRANCH} %package -n libndr-standard0 -License: GPL-3.0+ Summary: NDR marshallers for the standard set of DCE/RPC interfaces +License: GPL-3.0+ Group: System/Libraries %description -n libndr-standard0 @@ -637,8 +637,8 @@ Branch: %{BRANCH} %package -n libndr-standard-devel -License: GPL-3.0+ Summary: Development files for the libndr-standard library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr-standard0 = %{version} Requires: samba-core-devel = %{version} @@ -652,8 +652,8 @@ Branch: %{BRANCH} %package -n libndr0 -License: GPL-3.0+ Summary: Network Data Representation library +License: GPL-3.0+ Group: System/Libraries %description -n libndr0 @@ -665,8 +665,8 @@ Branch: %{BRANCH} %package -n libndr-devel -License: GPL-3.0+ Summary: Development files for the Network Data Representation library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libndr0 = %{version} Requires: samba-core-devel = %{version} @@ -683,8 +683,8 @@ Branch: %{BRANCH} %package -n libpdb0 -License: GPL-3.0+ Summary: Samba3 password database library +License: GPL-3.0+ Group: System/Libraries %description -n libpdb0 @@ -694,11 +694,11 @@ Branch: %{BRANCH} %package -n libpdb-devel -License: GPL-3.0+ Summary: Development files for the Samba3 password database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version} Requires: libtevent-devel %description -n libpdb-devel @@ -710,8 +710,8 @@ Branch: %{BRANCH} %package -n libregistry0 -License: GPL-3.0+ Summary: Windows-style registry library +License: GPL-3.0+ Group: System/Libraries %description -n libregistry0 @@ -721,8 +721,8 @@ Branch: %{BRANCH} %package -n libregistry-devel -License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libregistry0 = %{version} Requires: samba-core-devel = %{version} @@ -736,8 +736,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials0 -License: GPL-3.0+ Summary: Samba credential management library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-credentials0 @@ -747,8 +747,8 @@ Branch: %{BRANCH} %package -n libsamba-credentials-devel -License: GPL-3.0+ Summary: Development files for the Samba credential management library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-credentials0 = %{version} @@ -761,8 +761,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig0 -License: GPL-3.0+ Summary: Host-wide Samba configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-hostconfig0 @@ -772,8 +772,8 @@ Branch: %{BRANCH} %package -n libsamba-hostconfig-devel -License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-hostconfig0 = %{version} Requires: samba-core-devel = %{version} @@ -787,8 +787,8 @@ Branch: %{BRANCH} %package -n libsamba-policy0 -License: GPL-3.0+ Summary: Active Directory Group Policy library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-policy0 @@ -798,8 +798,8 @@ Branch: %{BRANCH} %package -n libsamba-policy-devel -License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-policy0 = %{version} @@ -812,8 +812,8 @@ Branch: %{BRANCH} %package -n libsamba-util0 -License: GPL-3.0+ Summary: Samba utility function library +License: GPL-3.0+ Group: System/Libraries %description -n libsamba-util0 @@ -823,8 +823,8 @@ Branch: %{BRANCH} %package -n libsamba-util-devel -License: GPL-3.0+ Summary: Development files for the Samba utility function library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamba-util0 = %{version} Requires: samba-core-devel = %{version} @@ -838,8 +838,8 @@ Branch: %{BRANCH} %package -n libsamdb0 -License: GPL-3.0+ Summary: Samba's SAM database library +License: GPL-3.0+ Group: System/Libraries %description -n libsamdb0 @@ -849,8 +849,8 @@ Branch: %{BRANCH} %package -n libsamdb-devel -License: GPL-3.0+ Summary: Development files for Samba's SAM database library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsamdb0 = %{version} @@ -863,8 +863,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw0 -License: GPL-3.0+ Summary: Samba4's raw SMB client library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbclient-raw0 @@ -874,8 +874,8 @@ Branch: %{BRANCH} %package -n libsmbclient-raw-devel -License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbclient-raw0 = %{version} Requires: samba-core-devel = %{version} @@ -889,8 +889,8 @@ Branch: %{BRANCH} %package -n libsmbconf0 -License: GPL-3.0+ Summary: Samba3 configuration library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbconf0 @@ -902,8 +902,8 @@ Branch: %{BRANCH} %package -n libsmbconf-devel -License: GPL-3.0+ Summary: Development files for the Samba3 configuration library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbconf0 = %{version} @@ -919,8 +919,8 @@ Branch: %{BRANCH} %package -n libsmbldap0 -License: GPL-3.0+ Summary: Samba LDAP protocol helper function library +License: GPL-3.0+ Group: System/Libraries %description -n libsmbldap0 @@ -931,8 +931,8 @@ Branch: %{BRANCH} %package -n libsmbldap-devel -License: GPL-3.0+ Summary: Development files for the smbldap library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libsmbldap0 = %{version} Requires: libtalloc-devel @@ -950,8 +950,8 @@ Branch: %{BRANCH} %package -n libtevent-util0 -License: GPL-3.0+ Summary: tevent <-> system status code conversion utility library +License: GPL-3.0+ Group: System/Libraries %description -n libtevent-util0 @@ -963,8 +963,8 @@ Branch: %{BRANCH} %package -n libtevent-util-devel -License: GPL-3.0+ Summary: Development files for the Samba tevent utility library +License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: libtevent-devel Requires: libtevent-util0 = %{version} @@ -982,12 +982,12 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif Summary: Samba Client Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1001,12 +1001,12 @@ Branch: %{BRANCH} %package -n libsmbclient-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: krb5-devel Requires: %{libsmbclient_name} = %{version} +Requires: krb5-devel %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1017,8 +1017,8 @@ Branch: %{BRANCH} %package -n %{libnetapi_name} -License: GPL-3.0+ Summary: Samba netapi Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1030,8 +1030,8 @@ Branch: %{BRANCH} %package -n libnetapi-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libnetapi_name} = %{version} @@ -1045,12 +1045,12 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} -License: GPL-3.0+ %if 0%{?suse_version} > 1030 Provides: libsmbsharemodes = %{version} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library +License: GPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1062,8 +1062,8 @@ Branch: %{BRANCH} %package -n libsmbsharemodes-devel -License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support +License: GPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libsmbsharemodes_name} = %{version} @@ -1077,8 +1077,8 @@ Branch: %{BRANCH} %package -n %{libwbclient_name} -License: LGPL-3.0+ Summary: Samba libwbclient Library +License: LGPL-3.0+ Group: System/Libraries PreReq: /sbin/ldconfig @@ -1090,8 +1090,8 @@ Branch: %{BRANCH} %package -n libwbclient-devel -License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support +License: LGPL-3.0+ Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: %{libwbclient_name} = %{version} @@ -1236,7 +1236,6 @@ install -d -m 0755 -p \ %if 0%{?suse_version} && 0%{?suse_version} > 1020 %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services \ %endif - %{buildroot}/%{_sysconfdir}/permissions.d \ %{buildroot}/%{_sysconfdir}/security \ %{buildroot}/%{_sysconfdir}/slp.reg.d \ %{buildroot}/%{CONFIGDIR} \ @@ -1561,9 +1560,6 @@ fi %if 0%{?suse_version} > 1220 %{fillup_only -ans samba client} %endif -if ! test -e %{_bindir}/get_printing_ticket; then - ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb -fi %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %postun client