packages: bacula/bacula.spec - do not package last installed (via %database...
glen
glen at pld-linux.org
Mon Oct 4 16:22:30 CEST 2010
Author: glen Date: Mon Oct 4 14:22:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- do not package last installed (via %databases macro) libbacsql library as ghost
---- Files affected:
packages/bacula:
bacula.spec (1.152 -> 1.153)
---- Diffs:
================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.152 packages/bacula/bacula.spec:1.153
--- packages/bacula/bacula.spec:1.152 Mon Oct 4 16:18:59 2010
+++ packages/bacula/bacula.spec Mon Oct 4 16:22:25 2010
@@ -13,9 +13,6 @@
#*** WARNING: identical binaries are copied, not linked:
# /usr/sbin/bat
# and /usr/bin/bat
-#*** WARNING: identical binaries are copied, not linked:
-# /usr/lib64/libbacsql-postgresql-5.0.3.so
-# and /usr/lib64/libbacsql-5.0.3.so
#
# Conditional build:
%bcond_without console_wx # wx-console program
@@ -566,7 +563,6 @@
%install
rm -rf $RPM_BUILD_ROOT
-
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,logrotate.d,pam.d,sysconfig}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/rescue
install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_mandir},%{_bindir},/var/log/bacula}
@@ -587,6 +583,10 @@
done
done
+# replace with empty file, replaced by ldconfig from each db-* package on intsall
+rm -f $RPM_BUILD_ROOT%{_libdir}/libbacsql-%{version}.so
+touch $RPM_BUILD_ROOT%{_libdir}/libbacsql-%{version}.so
+
install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-dir
install -p %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-fd
install -p %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/bacula-sd
@@ -1062,6 +1062,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.153 2010/10/04 14:22:25 glen
+- do not package last installed (via %databases macro) libbacsql library as ghost
+
Revision 1.152 2010/10/04 14:18:59 glen
- install and package upgrade scripts from 2.0.x database (version 10); rel 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.152&r2=1.153&f=u
More information about the pld-cvs-commit
mailing list