[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-2998-geec5782
Karolin Seeger
kseeger at samba.org
Wed Sep 10 09:16:00 GMT 2008
The branch, v3-2-test has been updated
via eec57823cd6503339f8a54fed7dce0d4d41ab9a5 (commit)
via 165691927cdaaafc057de667294dff7a7bc8a991 (commit)
from 903868a474d4875807a131dffe74b5090c0dbcea (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit eec57823cd6503339f8a54fed7dce0d4d41ab9a5
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Sep 10 11:15:02 2008 +0200
WHATSNEW: Update changes since 3.2.3.
Karolin
commit 165691927cdaaafc057de667294dff7a7bc8a991
Author: Michael Adam <obnox at samba.org>
Date: Fri Aug 29 16:48:37 2008 +0200
packaging(RHEL): remove libmsrpc stuff which is no more...
Michael
(cherry picked from commit 3eaa33e9df6d58ef93f13a840b38a063649fffbc)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 1 +
packaging/RHEL/samba.spec.tmpl | 10 ----------
2 files changed, 1 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7af5981..ce223c9 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -22,6 +22,7 @@ Changes since 3.2.3
o Michael Adam <obnox at samba.org>
* BUG 5590: Fix binary stripping on older OS.
+ * BUG 5492: Fix RHEL SPEC file by removing libmsrpc stuff.
* Fix linking of cifs.upcall when nscd_flush_cache() is found.
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index d71e5b0..c4d4fd6 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -226,14 +226,6 @@ install -m 755 source/bin/libsmbclient.a $RPM_BUILD_ROOT%{_libdir}/libsmbclient.
install -m 644 source/include/libsmbclient.h $RPM_BUILD_ROOT%{_includedir}
ln -s %{_libdir}/libsmbclient.so $RPM_BUILD_ROOT%{_libdir}/libsmbclient.so.0
-# make install puts libmsrpc.so in the wrong place on x86_64
-rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.so $RPM_BUILD_ROOT/usr/lib*/samba/libmsrpc.a || true
-install -m 755 source/bin/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so
-install -m 755 source/bin/libmsrpc.a $RPM_BUILD_ROOT%{_libdir}/libmsrpc.a
-install -m 644 source/include/libmsrpc.h $RPM_BUILD_ROOT%{_includedir}
-rm -f $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc.*
-ln -s /%{_libdir}/libmsrpc.so $RPM_BUILD_ROOT%{_libdir}/libmsrpc.so.0
-
# make install puts libsmbsharemodes.so in the wrong place on x86_64
rm -f $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.so $RPM_BUILD_ROOT/usr/lib*/samba/libsmbsharemodes.a || true
install -m 755 source/bin/libsmbsharemodes.so $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so
@@ -477,8 +469,6 @@ fi
%{_includedir}/libsmbclient.h
%{_libdir}/libsmbclient.*
-%{_includedir}/libmsrpc.h
-%{_libdir}/libmsrpc.*
%{_includedir}/smb_share_modes.h
%{_libdir}/libsmbsharemodes.*
--
Samba Shared Repository
More information about the samba-cvs
mailing list