rpms/samba4/devel samba4.spec,1.4,1.5
Simo Sorce
simo at fedoraproject.org
Wed Mar 4 01:53:08 UTC 2009
- Previous message: rpms/python-virtinst/devel .cvsignore, 1.16, 1.17 python-virtinst.spec, 1.54, 1.55 sources, 1.16, 1.17 virtinst-0.400.1-fedora11-ostype.patch, 1.1, NONE virtinst-0.400.1-fix-extra-args.patch, 1.1, NONE
- Next message: rpms/gnome-media/devel .cvsignore, 1.49, 1.50 gnome-media.spec, 1.155, 1.156 sources, 1.48, 1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: simo
Update of /cvs/pkgs/rpms/samba4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17285
Modified Files:
samba4.spec
Log Message:
* Mon Mar 2 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-7alpha7
- Compile and have separate packages for additional samba libraries
Package in their own packages: talloc, tdb, tevent, ldb
Index: samba4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba4/devel/samba4.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- samba4.spec 3 Mar 2009 22:43:09 -0000 1.4
+++ samba4.spec 4 Mar 2009 01:52:37 -0000 1.5
@@ -1,4 +1,4 @@
-%define main_release 6
+%define main_release 7
%define samba4_version 4.0.0
%define talloc_version 1.2.0
@@ -81,6 +81,7 @@
BuildRequires: readline-devel
BuildRequires: sed
BuildRequires: autoconf
+BuildRequires: openldap-devel
%description
@@ -281,38 +282,46 @@
#cd source4
#script/mkversion.sh
#cd ..
-cp -a source4/lib/ldb lib/ldb
+
+# For now copy libraries into another part of the tree, because the samba4
+# build would fail if it finds standalone bits already built
+mkdir -p standalone/lib
+cp -a lib/replace standalone/lib/replace
+cp -a lib/talloc standalone/lib/talloc
+cp -a lib/tdb standalone/lib/tdb
+cp -a lib/tevent standalone/lib/tevent
+cp -a source4/lib/ldb standalone/lib/ldb
%build
-%define shared_build_dir %{_sourcedir}/sbtmp
+%define shared_build_dir %{_sourcedir}/standalone/sbtmp
SAVE_LDLPATH=$LD_LIBRARY_PATH
SAVE_CFLAGS=$CFLAGS
-export LD_LIBRARY_PATH=%{shared_build_dir}/%{_lib}
+export LD_LIBRARY_PATH=%{shared_build_dir}/lib
export CFLAGS="$CFLAGS -I%{shared_build_dir}/include"
# talloc
-pushd lib/talloc
+pushd standalone/lib/talloc
./autogen.sh
%configure --with-shared-build-dir=%{shared_build_dir}
make shared-build %{?_smp_mflags}
popd
# tdb
-pushd lib/tdb
+pushd standalone/lib/tdb
./autogen.sh
%configure --with-shared-build-dir=%{shared_build_dir}
make shared-build %{?_smp_mflags}
popd
# tevent
-pushd lib/tevent
+pushd standalone/lib/tevent
./autogen.sh
%configure --with-shared-build-dir=%{shared_build_dir}
make shared-build %{?_smp_mflags}
popd
# ldb
-pushd lib/ldb
+pushd standalone/lib/ldb
./autogen.sh
%configure --with-shared-build-dir=%{shared_build_dir}
make shared-build # %{?_smp_mflags} XXX Causes build failure on F10
@@ -419,7 +428,7 @@
rm $RPM_BUILD_ROOT%{_bindir}/setnttoken
rm $RPM_BUILD_ROOT%{_bindir}/smbtorture
rm $RPM_BUILD_ROOT%{_bindir}/subunitrun
-#rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture
+rm $RPM_BUILD_ROOT%{_bindir}/tdbtorture
# Avoids a file conflict with perl-Parse-Yapp.
rm -rf $RPM_BUILD_ROOT%{perl_vendorlib}/Parse/Yapp
@@ -471,26 +480,26 @@
%endif
# talloc
-pushd lib/talloc
+pushd standalone/lib/talloc
make install DESTDIR=$RPM_BUILD_ROOT
ln -s libtalloc.so.%{talloc_version} $RPM_BUILD_ROOT%{_libdir}/libtalloc.so
-find $RPM_BUILD_ROOT/usr/share/swig -name talloc.i -delete
+#rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i || :
popd
# tdb
-pushd lib/tdb
+pushd standalone/lib/tdb
make install DESTDIR=$RPM_BUILD_ROOT
ln -s libtdb.so.%{tdb_version} $RPM_BUILD_ROOT%{_libdir}/libtdb.so
popd
# tevent
-pushd lib/tevent
+pushd standalone/lib/tevent
make install DESTDIR=$RPM_BUILD_ROOT
ln -s libtevent.so.%{tevent_version} $RPM_BUILD_ROOT%{_libdir}/libtevent.so
popd
# ldb
-pushd lib/ldb
+pushd standalone/lib/ldb
make install DESTDIR=$RPM_BUILD_ROOT
ln -s -f libldb.so.%{ldb_version} $RPM_BUILD_ROOT%{_libdir}/libldb.so
mkdir $RPM_BUILD_ROOT%{_libdir}/ldb
@@ -730,8 +739,8 @@
%{_mandir}/man1/ldbmodify.1.*
%{_mandir}/man1/ldbrename.1.*
%{_mandir}/man1/ldbsearch.1.*
-%{_mandir}/man1/ad2oLschema.1.gz
-%{_mandir}/man1/oLschema2ldif.1.gz
+#%{_mandir}/man1/ad2oLschema.1.gz
+#%{_mandir}/man1/oLschema2ldif.1.gz
%files -n libtalloc-devel
%defattr(-,root,root,-)
@@ -763,7 +772,7 @@
%{_mandir}/man3/ldb.3.gz
%changelog
-* Mon Mar 2 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-6alpha7
+* Mon Mar 2 2009 Simo Sorce <ssorce at redhat.com> - 4.0.0-7alpha7
- Compile and have separate packages for additional samba libraries
Package in their own packages: talloc, tdb, tevent, ldb
- Previous message: rpms/python-virtinst/devel .cvsignore, 1.16, 1.17 python-virtinst.spec, 1.54, 1.55 sources, 1.16, 1.17 virtinst-0.400.1-fedora11-ostype.patch, 1.1, NONE virtinst-0.400.1-fix-extra-args.patch, 1.1, NONE
- Next message: rpms/gnome-media/devel .cvsignore, 1.49, 1.50 gnome-media.spec, 1.155, 1.156 sources, 1.48, 1.49
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list