rpms/libtdb/EL-5 libtdb.spec,1.8,1.9

[Stephen Gallagher]

Author: sgallagh

Update of /cvs/pkgs/rpms/libtdb/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15597

Modified Files:
	libtdb.spec 
Log Message:
* Mon Mar 29 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.1-4
- Disable building tdb-tools on RHEL5. They conflict with the
- samba package. Instead, Require: samba



Index: libtdb.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libtdb/EL-5/libtdb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- libtdb.spec	25 Feb 2010 12:23:06 -0000	1.8
+++ libtdb.spec	6 Apr 2010 14:53:24 -0000	1.9
@@ -1,6 +1,6 @@
 Name: libtdb
 Version: 1.2.1
-Release: 2%{?dist}
+Release: 4%{?dist}
 Group: System Environment/Daemons
 Summary: The tdb library
 License: LGPLv3+
@@ -27,7 +27,8 @@ Header files needed to develop programs 
 %package -n tdb-tools
 Group: Development/Libraries
 Summary: Developer tools for the Tdb library
-Requires: libtdb = %{version}-%{release}
+#Requires: libtdb = %{version}-%{release}
+Requires: samba
 
 %description -n tdb-tools
 Tools to manage Tdb files
@@ -50,6 +51,14 @@ cd $RPM_BUILD_ROOT%{_libdir}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libtdb.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/tdb.so
 
+#Disable packaging tdb-tools on RHEL5
+rm -f \
+    $RPM_BUILD_ROOT%{_bindir}/tdbbackup \
+    $RPM_BUILD_ROOT%{_bindir}/tdbdump \
+    $RPM_BUILD_ROOT%{_bindir}/tdbtool \
+    $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8* \
+    $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8* \
+    $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -66,14 +75,20 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/README
 %doc docs/tracing.txt
 
+# On RHEL5, the 'samba' package already
+# provides these files. We need to create
+# this subpackage anyway because version
+# 1.2.1-2 existed in the stable EPEL repo
+# and conflicted with samba
+
 %files -n tdb-tools
 %defattr(-,root,root,-)
-%{_bindir}/tdbbackup
-%{_bindir}/tdbdump
-%{_bindir}/tdbtool
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
+#%{_bindir}/tdbbackup
+#%{_bindir}/tdbdump
+#%{_bindir}/tdbtool
+#%{_mandir}/man8/tdbbackup.8*
+#%{_mandir}/man8/tdbdump.8*
+#%{_mandir}/man8/tdbtool.8*
 
 
 %post -p /sbin/ldconfig
@@ -81,6 +96,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 29 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.1-4
+- Disable building tdb-tools on RHEL5. They conflict with the
+- samba package. Instead, Require: samba
+
 * Thu Feb 25 2010 Stephen Gallagher <sgallagh at redhat.com> - 1.2.1-2
 - Remove unnecessary --prefix argument to configure