From d2b4b0979500f1a200c5994d66a65019ea64740778a1620fcdecfcd102582b41 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 6 May 2008 16:38:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=13 --- build-source-timestamp | 2 +- samba-doc.spec | 7 ++- samba.changes | 10 ++++ samba.spec | 107 +++++++++++++++++++++-------------------- vendor-files.tar.bz2 | 4 +- 5 files changed, 70 insertions(+), 60 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 0adf0a9..a6b44ea 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -1738 +1743 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 5e0b08f..ac78f8e 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -19,7 +19,7 @@ BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5 License: GPL v3 or later Url: http://www.samba.org/ Version: 3.2.0 -Release: 5 +Release: 10 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -52,7 +52,6 @@ Source3: build-source-timestamp %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook %define SWATDIR %{_datadir}/samba/swat %define LOGDIR %{_localstatedir}/log/samba -%define LIBDIR %{_libdir}/samba %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba %define INITDIR %{_sysconfdir}/init.d @@ -142,7 +141,7 @@ CONFIGURE_OPTIONS="\ --localstatedir=%{LOCKDIR} \ --sysconfdir=%{CONFIGDIR} \ --with-configdir=%{CONFIGDIR} \ - --with-libdir=%{LIBDIR} \ + --with-libdir=%{_libdir} \ --with-lockdir=%{LOCKDIR} \ --with-logfilebase=%{LOGDIR} \ --with-mandir=%{_mandir} \ @@ -299,7 +298,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 5ddf895..030ddd3 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Apr 28 16:55:00 CEST 2008 - lmuelle@suse.de + +- Use _libdir macro instead of a local define of LIBDIR. + +------------------------------------------------------------------- +Mon Apr 28 15:10:24 CEST 2008 - lmuelle@suse.de + +- Remove PreReq /sbin/ldconfig from the libtdb-devel package. + ------------------------------------------------------------------- Sat Apr 26 18:03:06 CEST 2008 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 669d5ac..972fc5f 100644 --- a/samba.spec +++ b/samba.spec @@ -23,7 +23,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.2.0 -Release: 5 +Release: 10 %if %{suse_version} < 1031 Provides: samba3 = %{version}-%{release} Obsoletes: samba3 < %{version} @@ -58,7 +58,6 @@ Source11: http://www.hhrm.de/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 %define DOCBOOKDIR %{_defaultdocdir}/%{name}/docbook %define SWATDIR %{_datadir}/samba/swat %define LOGDIR %{_localstatedir}/log/samba -%define LIBDIR %{_libdir}/samba %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba %define INITDIR %{_sysconfdir}/init.d @@ -242,7 +241,6 @@ License: GPL v3 or later Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Productivity/Networking/Samba AutoReqProv: on -PreReq: /sbin/ldconfig Requires: libtdb0 = %{version} %package -n libwbclient0 @@ -265,7 +263,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 178 +Release: 183 Requires: perl-ldap %endif %if %{suse_version} > 920 @@ -379,7 +377,7 @@ CONFIGURE_OPTIONS="\ --localstatedir=%{LOCKDIR} \ --sysconfdir=%{CONFIGDIR} \ --with-configdir=%{CONFIGDIR} \ - --with-libdir=%{LIBDIR} \ + --with-libdir=%{_libdir} \ --with-lockdir=%{LOCKDIR} \ --with-logfilebase=%{LOGDIR} \ --with-mandir=%{_mandir} \ @@ -465,7 +463,7 @@ mkdir -p \ ${RPM_BUILD_ROOT}/sbin \ ${RPM_BUILD_ROOT}/%{_includedir} \ ${RPM_BUILD_ROOT}/%{_libdir}/python/lib-dynload \ - ${RPM_BUILD_ROOT}/%{LIBDIR}/{config,vfs,pdb,rpc,auth,charset,idmap} \ + ${RPM_BUILD_ROOT}/%{_libdir}/samba/{config,vfs,pdb,rpc,auth,charset,idmap} \ ${RPM_BUILD_ROOT}/%{_datadir}/omc/svcinfo.d \ ${RPM_BUILD_ROOT}/%{_datadir}/samba/{LDAP,templates} \ ${RPM_BUILD_ROOT}/%{_localstatedir}/adm \ @@ -581,10 +579,9 @@ install -m 0755 source/nsswitch/libnss_winbind.so ${RPM_BUILD_ROOT}/%{_lib}/libn cp -p source/bin/smbfilter ${RPM_BUILD_ROOT}/%{_bindir}/ # smbget cp -p source/bin/smbget ${RPM_BUILD_ROOT}/%{_bindir}/ -# workaround for wrong(?) used LIBDIR setting -# FIXME Use LIBDIR as intended and LIBDIR/samba else. +# workaround for broken make install target for file in libnetapi libsmbclient libsmbsharemodes libtalloc libtdb libwbclient; do - rm "${RPM_BUILD_ROOT}/%{LIBDIR}/${file}.so" + rm "${RPM_BUILD_ROOT}/%{_libdir}/samba/${file}.so" # install libs test -e "source/bin/${file}.a" && \ install -m 0644 "source/bin/${file}.a" "${RPM_BUILD_ROOT}/%{_libdir}" @@ -685,7 +682,7 @@ rm -f \ ${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1* %endif # sort out vscan-modules from the main filelist -for file in $( find ${RPM_BUILD_ROOT}%{LIBDIR}/vfs/ -mindepth 1 ! -iname '*vscan*' ); do +for file in $( find ${RPM_BUILD_ROOT}%{_libdir}/samba/vfs/ -mindepth 1 ! -iname '*vscan*' ); do echo "${file#${RPM_BUILD_ROOT}}" >>${RPM_BUILD_DIR}/samba-%{samba_ver_full}/filelist-samba done # copy the schema @@ -875,12 +872,12 @@ fi %{_sysconfdir}/slp.reg.d %config(noreplace) %{_sysconfdir}/xinetd.d/swat /%{_lib}/security/pam_smbpass.so -%dir %{LIBDIR} -%dir %{LIBDIR}/vfs -%{LIBDIR}/auth -%{LIBDIR}/config -%{LIBDIR}/rpc -%{LIBDIR}/*.msg +%dir %{_libdir}/samba +%dir %{_libdir}/samba/vfs +%{_libdir}/samba/auth +%{_libdir}/samba/config +%{_libdir}/samba/rpc +%{_libdir}/samba/*.msg %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles @@ -984,15 +981,15 @@ fi %dir %{_libdir}/cups %dir %{_libdir}/cups/backend %ghost %{_libdir}/cups/backend/smb -%dir %{LIBDIR} -%{LIBDIR}/charset -%{LIBDIR}/lowcase.dat -%{LIBDIR}/upcase.dat -%{LIBDIR}/valid.dat -%dir %{LIBDIR}/nss_info -%{LIBDIR}/nss_info/rfc2307.so -%{LIBDIR}/nss_info/sfu.so -%{LIBDIR}/nss_info/sfu20.so +%dir %{_libdir}/samba +%{_libdir}/samba/charset +%{_libdir}/samba/lowcase.dat +%{_libdir}/samba/upcase.dat +%{_libdir}/samba/valid.dat +%dir %{_libdir}/samba/nss_info +%{_libdir}/samba/nss_info/rfc2307.so +%{_libdir}/samba/nss_info/sfu.so +%{_libdir}/samba/nss_info/sfu20.so %doc %{_mandir}/man1/findsmb.1.gz %doc %{_mandir}/man1/ldbadd.1.gz %doc %{_mandir}/man1/ldbdel.1.gz @@ -1065,7 +1062,7 @@ fi %{_sbindir}/winbindd /%{_lib}/libnss_winbind.so.2 /%{_lib}/security/pam_winbind.so -%{LIBDIR}/idmap +%{_libdir}/samba/idmap %doc %{_mandir}/man7/pam_winbind.7.gz %doc %{_mandir}/man8/idmap_ad.8.gz %doc %{_mandir}/man8/idmap_ldap.8.gz @@ -1122,17 +1119,17 @@ fi %files pdb %defattr(-,root,root) -%{LIBDIR}/pdb +%{_libdir}/samba/pdb %doc examples/pdb/{Makefile,README,test.c} %endif %if %{make_vscan} %files vscan %defattr(-,root,root) -%{LIBDIR}/vfs/vscan* +%{_libdir}/samba/vfs/vscan* %doc samba-vscan-%{vscan_ver}/{AUTHORS,COPYING,ChangeLog,FAQ,INSTALL,NEWS,README,TODO} %doc samba-vscan-%{vscan_ver}/*/vscan-*.conf -%dir %{LIBDIR}/vfs +%dir %{_libdir}/samba/vfs %endif %files -n libnetapi0 @@ -1244,7 +1241,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %if %{suse_version} > 1020 @@ -1259,7 +1256,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1286,7 +1283,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description winbind @@ -1298,7 +1295,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %if %{make_utils} @@ -1330,7 +1327,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1344,7 +1341,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %if %{make_pdb} @@ -1358,7 +1355,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1376,7 +1373,7 @@ Authors: -------- Rainer Link -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1390,7 +1387,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libnetapi-devel @@ -1403,7 +1400,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %if %{suse_version} < 1031 @@ -1423,7 +1420,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %else @@ -1437,7 +1434,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1456,7 +1453,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %if %{suse_version} < 1031 @@ -1470,7 +1467,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %else @@ -1484,7 +1481,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1504,7 +1501,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libtalloc1 @@ -1516,7 +1513,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libtalloc-devel @@ -1529,7 +1526,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libtdb0 @@ -1541,7 +1538,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libtdb-devel @@ -1554,7 +1551,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libwbclient0 @@ -1566,7 +1563,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %description -n libwbclient-devel @@ -1579,7 +1576,7 @@ Authors: -------- The Samba Team -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %if %{make_ldapsmb} @@ -1594,7 +1591,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif @@ -1610,12 +1607,16 @@ Authors: -------- Steve French -Source Timestamp: 1738 +Source Timestamp: 1743 Branch : trunk %endif %changelog +* Mon Apr 28 2008 lmuelle@suse.de +- Use _libdir macro instead of a local define of LIBDIR. +* Mon Apr 28 2008 lmuelle@suse.de +- Remove PreReq /sbin/ldconfig from the libtdb-devel package. * Sat Apr 26 2008 lmuelle@suse.de - Install the shared libraries with the same name as used as soname. * Fri Apr 25 2008 lmuelle@suse.de diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0b73136..5b75e64 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:accfb09e46cd3b04921a1ad135fcb336aaa4b6acca9a823a01865af0b3302599 -size 21918 +oid sha256:d200dbf2f2d7c5bf4d7633c22a6b963770de4b2152f76a906d3f97af72076cb1 +size 21914