Don't clutter the spec file diff view; (bnc#783384).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=268

build-source-timestamp

@@ -1,2 +1 @@
-2860
+SOURCE_TIMESTAMP="2866"
-Branch      : 3.6.9

patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7f1ba3f9d53c7c2381eeec962016ab1b3e5d4be8bc72fba53e5f017c381063c2
+oid sha256:88e41f7812dae00bd6818788c338388a231b0aae5c856c1b140241f185c3bb2a
-size 44258
+size 44082

samba-doc.spec

@@ -17,7 +17,6 @@
 
 # norootforbuild
 
-
 Name:           samba-doc
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 BuildRequires:  autoconf
@@ -117,8 +116,10 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
+%define SOURCE_TIMESTAMP 2866
+%define BRANCH 3.6.9
 Version:        3.6.9
-Release:        1
+Release:        0
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
 License:        GPL-3.0+
@@ -199,7 +200,6 @@ BuildRequires:  ccache
 %define cups_lib_dir %{_libdir}/cups
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %prep
 # samba-doc nowadays is part the main samba spec file
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -447,7 +447,6 @@ fi
 
 # samba-doc nowadays is part the main samba spec file
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
-
 %files -f filelist-samba-doc
 %defattr(-,root,root)
 %dir %{DOCDIR}
@@ -458,11 +457,12 @@ fi
 %endif
 
 %description
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
 
 %changelog

samba.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com
+
+- Don't clutter the spec file diff view; (bnc#783384).
+
 -------------------------------------------------------------------
 Fri Nov 16 18:23:42 UTC 2012 - lmuelle@suse.com
 

samba.spec

@@ -17,7 +17,6 @@
 
 # norootforbuild
 
-
 Name:           samba
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 BuildRequires:  autoconf
@@ -117,8 +116,10 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
+%define SOURCE_TIMESTAMP 2866
+%define BRANCH 3.6.9
 Version:        3.6.9
-Release:        1
+Release:        0
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
 Url:            http://www.samba.org/
@@ -208,6 +209,9 @@ BuildRequires:  ccache
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 Samba is a suite of programs that allows SMB/CIFS clients to use the
 Unix file space, printers, and authentication subsystem.
 
@@ -224,9 +228,6 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package client
 License:        GPL-3.0+
 Summary:        Samba Client Utilities
@@ -249,6 +250,9 @@ PreReq:         coreutils
 Requires:       cifs-utils
 
 %description client
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 Samba is a suite of programs that allows SMB/CIFS clients to use the
 Unix file space, printers, and authentication subsystem.
 
@@ -265,11 +269,7 @@ binary packages of the most current Samba version, and a bug reporting
 how to.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
-
 %package devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with Samba Support
@@ -281,13 +281,13 @@ Obsoletes:      samba-devel-64bit
 %endif
 
 %description devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
 
@@ -306,13 +306,13 @@ BuildArch:      noarch
 %endif
 
 %description doc
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
 
 %package krb-printing
@@ -328,28 +328,27 @@ PreReq:         permissions
 Requires:       samba-client >= %{version}
 
 %description krb-printing
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 A wrapper binary to run smbspool with the original calling UID.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %if %{make_utils}
 
 %package utils
-
 Summary:        debug tools
 Group:          Productivity/Networking/Samba
 Provides:       samba-gplv3-utils = %{version}
 Obsoletes:      samba-gplv3-utils < %{version}
 
 %description utils
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 Some of the debug-tools for developpers.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
 
 %package winbind
@@ -377,20 +376,17 @@ PreReq:         /usr/sbin/groupadd
 PreReq:         coreutils
 
 %description winbind
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This is the winbind-daemon and the wbinfo-tool.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %package -n libsmbclient
 License:        GPL-3.0+
 %else
-
 %package -n libsmbclient0
-
 License:        GPL-3.0+
 Provides:       libsmbclient = %{version}
 Obsoletes:      libsmbclient
@@ -403,20 +399,13 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %description -n libsmbclient
-
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %else
-
 %description -n libsmbclient0
-
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the libsmbclient library.
 
 libsmbclient is provided by the libsmbclient0 package.
@@ -425,6 +414,7 @@ This entry is required to allow a samba.spec file providing
 libsmbclient for SUSE version < 11.0 while versions > 10.0 will have
 libsmbclient0.
 
+
 %package -n libsmbclient-devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with smbclient Support
@@ -448,13 +438,13 @@ Requires:       libsmbclient0 = %{version}
 %endif
 
 %description -n libsmbclient-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libnetapi0
 License:        GPL-3.0+
 Summary:        Samba netapi Library
@@ -462,12 +452,12 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libnetapi0
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the netapi library.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libnetapi-devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with netapi Support
@@ -480,21 +470,18 @@ BuildRequires:  pkgconfig
 Requires:       libnetapi0 = %{version}
 
 %description -n libnetapi-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %package -n libsmbsharemodes
 License:        GPL-3.0+
 %else
-
 %package -n libsmbsharemodes0
-
 License:        GPL-3.0+
 %endif
 Summary:        Samba smbsharemodes Library
@@ -502,22 +489,16 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %description -n libsmbsharemodes
-
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %else
-
 %description -n libsmbsharemodes0
-
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the smbsharemodes library.
 
+
 %package -n libsmbsharemodes-devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with smbsharemodes Support
@@ -534,13 +515,13 @@ Requires:       libsmbsharemodes0 = %{version}
 %endif
 
 %description -n libsmbsharemodes-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libwbclient0
 License:        LGPL-3.0+
 Summary:        Samba libwbclient Library
@@ -548,12 +529,12 @@ Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libwbclient0
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the wbclient library.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libwbclient-devel
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with wbclient Support
@@ -566,33 +547,31 @@ BuildRequires:  pkgconfig
 Requires:       libwbclient0 = %{version}
 
 %description -n libwbclient-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
 %package -n libtalloc2
 Version:        %{libtalloc_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba talloc Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libtalloc2
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the talloc library.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with talloc Support
 Group:          Development/Libraries/C and C++
@@ -604,31 +583,29 @@ BuildRequires:  pkgconfig
 Requires:       libtalloc2 = %{libtalloc_ver}
 
 %description -n libtalloc-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libtdb1
 Version:        %{libtdb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba tdb Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libtdb1
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the tdb library.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with tdb Support
 Group:          Development/Libraries/C and C++
@@ -636,31 +613,29 @@ Group:          Development/Libraries/C and C++
 Requires:       libtdb1 = %{libtdb_ver}
 
 %description -n libtdb-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libtevent0
 Version:        %{libtevent_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba tevent Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
 %description -n libtevent0
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the tevent library.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with tevent Support
 Group:          Development/Libraries/C and C++
@@ -673,16 +648,15 @@ Requires:       libtalloc-devel
 Requires:       libtevent0 = %{libtevent_ver}
 
 %description -n libtevent-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libldb1
 Version:        %{libldb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba ldb Library
 Group:          System/Libraries
@@ -690,15 +664,14 @@ BuildRequires:  popt-devel
 PreReq:         /sbin/ldconfig
 
 %description -n libldb1
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package includes the ldb library.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %package -n libldb-devel
 Version:        %{libldb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with ldb Support
 Group:          Development/Libraries/C and C++
@@ -711,32 +684,32 @@ Requires:       libldb1 = %{libldb_ver}
 Requires:       libtalloc-devel
 
 %description -n libldb-devel
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
 
 %if %{make_ldapsmb}
 
 %package -n ldapsmb
 Version:        1.34b
-Release:        307
+Release:        0
 License:        GPL-2.0+
 Summary:        Tool to administer Samba's LDAP backend
 Group:          Productivity/Networking/Samba
 Requires:       perl-ldap
 
 %description -n ldapsmb
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
 
-Source Timestamp: 2859
-Branch      : 3.6.9
-
 %endif
 
 %prep
@@ -1421,37 +1394,29 @@ fi
 %{?insserv_cleanup:%{insserv_cleanup}}
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %post -n libsmbclient
 %else
-
 %post -n libsmbclient0
 %endif
 /sbin/ldconfig
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %postun -n libsmbclient
 %else
-
 %postun -n libsmbclient0
 %endif
 /sbin/ldconfig
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %post -n libsmbsharemodes
 %else
-
 %post -n libsmbsharemodes0
 %endif
 /sbin/ldconfig
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %postun -n libsmbsharemodes
 %else
-
 %postun -n libsmbsharemodes0
 %endif
 /sbin/ldconfig
@@ -1754,10 +1719,8 @@ fi
 %{_libdir}/pkgconfig/netapi.pc
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %files -n libsmbclient
 %else
-
 %files -n libsmbclient0
 %endif
 %defattr(-,root,root)
@@ -1774,10 +1737,8 @@ fi
 %{_libdir}/pkgconfig/smbclient.pc
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
-
 %files -n libsmbsharemodes
 %else
-
 %files -n libsmbsharemodes0
 %endif
 %defattr(-,root,root)
@@ -1875,4 +1836,5 @@ fi
 %{_sbindir}/ldapsmb
 %{_mandir}/man5/ldapsmb.5.*
 %endif
+
 %changelog

vendor-files.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f52a65c1ef22eddf2d8c7a11caef3577c34f6acb7cc294509892e6fa18df2f5
+oid sha256:0e021b431ff73b8c54b13b1ddf2b334c91ef4cbe0984f5d8b40ba18b6cbe29df
-size 53908
+size 53424