rpms/samba/F-9 .cvsignore, 1.51, 1.52 samba.spec, 1.160, 1.161 sources, 1.55, 1.56

Guenther Deschner gd at fedoraproject.org
Mon Aug 25 14:24:15 UTC 2008 

Author: gd

Update of /cvs/pkgs/rpms/samba/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20615

Modified Files:
	.cvsignore samba.spec sources 
Log Message:
- Update to 3.2.2
- resolves: #456889

Guenther



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	6 Aug 2008 14:57:26 -0000	1.51
+++ .cvsignore	25 Aug 2008 14:23:45 -0000	1.52
@@ -1 +1 @@
-samba-3.2.1.tar.gz
+samba-3.2.2.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/samba.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- samba.spec	6 Aug 2008 18:11:19 -0000	1.160
+++ samba.spec	25 Aug 2008 14:23:45 -0000	1.161
@@ -1,5 +1,5 @@
-%define main_release 18
-%define samba_version 3.2.1
+%define main_release 19
+%define samba_version 3.2.2
 %define tdb_version 1.1.1
 %define talloc_version 1.2.0
 
@@ -8,7 +8,7 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.2.1
+Version: 3.2.2
 Release: %{samba_release}
 License: GPLv3+ and LGPLv3+
 Group: System Environment/Daemons
@@ -303,7 +303,7 @@
 	--with-pammodulesdir=%{_lib}/security \
 	--with-swatdir=%{_datadir}/swat \
 	--with-shared-modules=idmap_ad,idmap_rid \
-	--with-cifsspnego
+	--with-cifsupcall
 
 #	--with-cluster-support \
 #	--with-aio-support \
@@ -321,7 +321,7 @@
 	-C lib/netapi/examples
 
 make  CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" \
-	debug2html smbfilter bin/cifs.spnego
+	debug2html smbfilter bin/cifs.upcall
 
 ( cd client ; gcc -o mount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE mount.cifs.c )
 ( cd client ; gcc -o umount.cifs $RPM_OPT_FLAGS -Wall -O -D_GNU_SOURCE -D_LARGEFILE64_SOURCE umount.cifs.c )
@@ -405,37 +405,19 @@
 ./autogen.sh && ./configure --prefix=%{_prefix} --libdir=%{_libdir}
 cd ../../..
 
-# make install puts libraries in the wrong place 
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.a || true
-install -m 755 source/bin/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
-install -m 644 source/pkgconfig/smbclient.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/smbclient.pc
-ln -s libsmbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so
-#install -m 644 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.a
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libsmbsharemodes.so || true
-install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so.0
-install -m 644 source/pkgconfig/smbsharemodes.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/smbsharemodes.pc
-ln -s libsmbsharemodes.so.0 $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libnetapi.so $RPM_BUILD_ROOT%{_libdir}/samba/libnetapi.a || true
-install -m 755 source/bin/libnetapi.so $RPM_BUILD_ROOT%{_libdir}/libnetapi.so.0
-install -m 644 source/pkgconfig/netapi.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/netapi.pc
-ln -s libnetapi.so.0 $RPM_BUILD_ROOT%{_libdir}/libnetapi.so
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtalloc.so $RPM_BUILD_ROOT%{_libdir}/samba/libtalloc.a || true
-install -m 755 source/bin/libtalloc.so $RPM_BUILD_ROOT%{_libdir}/libtalloc.so.1
-install -m 644 source/lib/talloc/talloc.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/talloc.pc
-ln -s libtalloc.so.1 $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.so $RPM_BUILD_ROOT%{_libdir}/samba/libtdb.a || true
-install -m 755 source/bin/libtdb.so $RPM_BUILD_ROOT%{_libdir}/libtdb.so.1
-install -m 644 source/lib/tdb/tdb.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/tdb.pc
-ln -s libtdb.so.1 $RPM_BUILD_ROOT%{_libdir}/libtdb.so
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.so $RPM_BUILD_ROOT%{_libdir}/samba/libwbclient.a || true
-install -m 755 source/bin/libwbclient.so $RPM_BUILD_ROOT%{_libdir}/libwbclient.so.0
-install -m 644 source/pkgconfig/wbclient.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/wbclient.pc
-ln -s libwbclient.so.0 $RPM_BUILD_ROOT%{_libdir}/libwbclient.so
+# make install puts libraries in the wrong place
+# (but at least gets the versioning right now)
+
+list="smbclient smbsharemodes netapi talloc tdb wbclient"
+build_libdir="$RPM_BUILD_ROOT%{_libdir}"
+for i in $list; do
+	cp -P $build_libdir/samba/lib$i.so* $build_libdir/
+	install -m 644 source/pkgconfig/$i.pc $build_libdir/pkgconfig/ || true
+	rm -f $build_libdir/samba/lib$i.so* $build_libdir/samba/lib$i.a || true
+done
+
+install -m 644 source/lib/talloc/talloc.pc $build_libdir/pkgconfig/
+install -m 644 source/lib/tdb/tdb.pc $build_libdir/pkgconfig/
 
 /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/
 
@@ -448,7 +430,7 @@
 install -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/samba
 install -m755 source/client/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
 install -m755 source/client/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
-install -m755 source/bin/cifs.spnego $RPM_BUILD_ROOT/sbin/cifs.spnego
+install -m755 source/bin/cifs.upcall $RPM_BUILD_ROOT/sbin/cifs.upcall
 
 install -m 755 source/lib/netapi/examples/bin/netdomjoin-gui $RPM_BUILD_ROOT/%{_sbindir}/netdomjoin-gui
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}
@@ -469,7 +451,7 @@
 
 # why are these getting installed in the wrong place?
 rm -f $RPM_BUILD_ROOT%{_sbindir}/{u,}mount.cifs
-rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.spnego
+rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
 
 
 %clean
@@ -694,7 +676,7 @@
 %defattr(-,root,root)
 /sbin/mount.cifs
 /sbin/umount.cifs
-/sbin/cifs.spnego
+/sbin/cifs.upcall
 %{_bindir}/rpcclient
 %{_bindir}/smbcacls
 %{_bindir}/findsmb
@@ -716,6 +698,7 @@
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man8/mount.cifs.8*
 %{_mandir}/man8/umount.cifs.8*
+%{_mandir}/man8/cifs.upcall.8*
 
 %files common
 %defattr(-,root,root)
@@ -726,7 +709,8 @@
 %{_libdir}/samba/valid.dat
 %{_libdir}/libnss_wins.so
 /%{_lib}/libnss_wins.so.2
-%{_libdir}/libnetapi.so*
+%{_libdir}/libnetapi.so
+%attr(755,root,root) %{_libdir}/libnetapi.so.*
 %{_includedir}/netapi.h
 %{_libdir}/pkgconfig/netapi.pc
 %{_bindir}/net
@@ -775,7 +759,7 @@
 %{_bindir}/ntlm_auth
 %{_bindir}/wbinfo
 %{_libdir}/libnss_winbind.so
-%{_libdir}/libwbclient.so.*
+%attr(755,root,root) %{_libdir}/libwbclient.so.*
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
 /%{_lib}/libnss_winbind.so.2
@@ -802,8 +786,8 @@
 %doc docs/htmldocs
 
 %files -n libsmbclient
-%{_libdir}/libsmbclient.so.*
-%{_libdir}/libsmbsharemodes.so.*
+%attr(755,root,root) %{_libdir}/libsmbclient.so.*
+%attr(755,root,root) %{_libdir}/libsmbsharemodes.so.*
 
 %files -n libsmbclient-devel
 %{_includedir}/libsmbclient.h
@@ -815,7 +799,7 @@
 %{_mandir}/man7/libsmbclient.7*
 
 %files -n libtalloc
-%{_libdir}/libtalloc.so.*
+%attr(755,root,root) %{_libdir}/libtalloc.so.*
 
 %files -n libtalloc-devel
 %{_includedir}/talloc.h
@@ -823,7 +807,7 @@
 %{_libdir}/pkgconfig/talloc.pc
 
 %files -n libtdb
-%{_libdir}/libtdb.so.*
+%attr(755,root,root) %{_libdir}/libtdb.so.*
 
 %files -n libtdb-devel
 %{_includedir}/tdb.h
@@ -846,6 +830,10 @@
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Aug 20 2008 Guenther Deschner <gdeschner at redhat.com> - 3.2.2-0.19
+- Update to 3.2.2
+- resolves: #456889
+
 * Wed Aug  6 2008 Simo Sorce <ssorce at redhat.com> - 3.2.1-0.18
 - Update to 3.2.1
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-9/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	6 Aug 2008 14:57:26 -0000	1.55
+++ sources	25 Aug 2008 14:23:45 -0000	1.56
@@ -1 +1 @@
-ed2b790b035e508177aa2d1547af383d  samba-3.2.1.tar.gz
+d5c54759e557009e5ec8d870bc735241  samba-3.2.2.tar.gz

More information about the fedora-extras-commits mailing list