Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1421 mails)

< Previous Next >
commit samba
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 06 May 2008 18:38:32 +0200
  • Message-id: <20080506163832.D381B67816D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package samba
checked in at Tue May 6 18:38:32 CEST 2008.


--------
--- samba/samba.changes 2008-04-26 20:40:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/samba/samba.changes 2008-05-05
19:53:16.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Apr 28 16:55:00 CEST 2008 - lmuelle@xxxxxxx
+
+- Use _libdir macro instead of a local define of LIBDIR.
+
+-------------------------------------------------------------------
+Mon Apr 28 15:10:24 CEST 2008 - lmuelle@xxxxxxx
+
+- Remove PreReq /sbin/ldconfig from the libtdb-devel package.
+
+-------------------------------------------------------------------



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ samba-doc.spec ++++++
--- /var/tmp/diff_new_pack.A30763/_old 2008-05-06 18:33:31.000000000 +0200
+++ /var/tmp/diff_new_pack.A30763/_new 2008-05-06 18:33:31.000000000 +0200
@@ -19,7 +19,7 @@
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 @@
%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 @@
--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 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%changelog

++++++ samba.spec ++++++
--- /var/tmp/diff_new_pack.A30763/_old 2008-05-06 18:33:31.000000000 +0200
+++ /var/tmp/diff_new_pack.A30763/_new 2008-05-06 18:33:31.000000000 +0200
@@ -23,7 +23,7 @@
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 @@
%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 @@
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 @@
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 @@
--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 @@
${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 @@
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 @@
${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 @@
%{_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 @@
%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 @@
%{_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 @@

%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 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%if %{suse_version} > 1020
@@ -1259,7 +1256,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1286,7 +1283,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description winbind
@@ -1298,7 +1295,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%if %{make_utils}
@@ -1330,7 +1327,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1344,7 +1341,7 @@
--------
Jeremy Allison <jra at samba dot org>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%if %{make_pdb}
@@ -1358,7 +1355,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1376,7 +1373,7 @@
--------
Rainer Link <rainer@xxxxxxxxxxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1390,7 +1387,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libnetapi-devel
@@ -1403,7 +1400,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%if %{suse_version} < 1031
@@ -1423,7 +1420,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%else
@@ -1437,7 +1434,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1456,7 +1453,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%if %{suse_version} < 1031
@@ -1470,7 +1467,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%else
@@ -1484,7 +1481,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1504,7 +1501,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libtalloc1
@@ -1516,7 +1513,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libtalloc-devel
@@ -1529,7 +1526,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libtdb0
@@ -1541,7 +1538,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libtdb-devel
@@ -1554,7 +1551,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libwbclient0
@@ -1566,7 +1563,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%description -n libwbclient-devel
@@ -1579,7 +1576,7 @@
--------
The Samba Team <samba@xxxxxxxxx>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%if %{make_ldapsmb}
@@ -1594,7 +1591,7 @@
--------
Guenther Deschner <guenther at deschner dot de>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif
@@ -1610,12 +1607,16 @@
--------
Steve French <sfrench at Samba dot org>

-Source Timestamp: 1738
+Source Timestamp: 1743
Branch : trunk

%endif

%changelog
+* Mon Apr 28 2008 lmuelle@xxxxxxx
+- Use _libdir macro instead of a local define of LIBDIR.
+* Mon Apr 28 2008 lmuelle@xxxxxxx
+- Remove PreReq /sbin/ldconfig from the libtdb-devel package.
* Sat Apr 26 2008 lmuelle@xxxxxxx
- Install the shared libraries with the same name as used as soname.
* Fri Apr 25 2008 lmuelle@xxxxxxx


++++++ build-source-timestamp ++++++
--- samba/build-source-timestamp 2008-04-26 20:46:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/samba/build-source-timestamp 2008-05-05
20:53:51.000000000 +0200
@@ -1,2 +1,2 @@
-1738
+1743
Branch : trunk

++++++ vendor-files.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/vendor-files/tools/package-data
new/vendor-files/tools/package-data
--- old/vendor-files/tools/package-data 2008-04-26 20:46:21.000000000 +0200
+++ new/vendor-files/tools/package-data 2008-05-05 20:53:51.000000000 +0200
@@ -1,2 +1,2 @@
# This is an autogenrated file.
-SAMBA_PACKAGE_SVN_VERSION="1738"
+SAMBA_PACKAGE_SVN_VERSION="1743"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >