packages: bacula/bacula.spec - fix duplicate bat install

glen glen at pld-linux.org
Mon Oct 4 16:25:46 CEST 2010


Author: glen                         Date: Mon Oct  4 14:25:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix duplicate bat install

---- Files affected:
packages/bacula:
   bacula.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: packages/bacula/bacula.spec
diff -u packages/bacula/bacula.spec:1.153 packages/bacula/bacula.spec:1.154
--- packages/bacula/bacula.spec:1.153	Mon Oct  4 16:22:25 2010
+++ packages/bacula/bacula.spec	Mon Oct  4 16:25:40 2010
@@ -9,10 +9,6 @@
 #make[1]: Leaving directory `/home/users/glen/rpm/BUILD.x86_64-linux/bacula-5.0.2/src/dird'
 #warning: Installed (but unpackaged) file(s) found:
 #   /usr/lib64/bacula/btraceback.mdb
-#   /usr/sbin/bat
-#*** WARNING: identical binaries are copied, not linked:
-#        /usr/sbin/bat
-#   and  /usr/bin/bat
 #
 # Conditional build:
 %bcond_without	console_wx		# wx-console program
@@ -608,9 +604,7 @@
 %endif
 
 %if %{with bat}
-# TODO: libtool install
-#libtool --silent --mode=install install src/qt-console/bat $RPM_BUILD_ROOT%{_bindir}
-install src/qt-console/.libs/bat $RPM_BUILD_ROOT%{_bindir}
+mv $RPM_BUILD_ROOT{%{_sbindir},%{_bindir}}/bat
 cp -a scripts/bat.desktop $RPM_BUILD_ROOT%{_desktopdir}
 %endif
 
@@ -1062,6 +1056,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2010/10/04 14:25:40  glen
+- fix duplicate bat install
+
 Revision 1.153  2010/10/04 14:22:25  glen
 - do not package last installed (via %databases macro) libbacsql library as ghost
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bacula/bacula.spec?r1=1.153&r2=1.154&f=u



More information about the pld-cvs-commit mailing list