Logoj0ke.net Open Build Service > Projects > server:backup > bacula5 > Changes
Sign Up | Log In

Changes of Revision 22

[-] Changed bacula.spec
​x
 
1
@@ -182,8 +182,7 @@
2
 touch platforms/suse/bacula.spec.in
3
 %install
4
 Build() {
5
-#  ##CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS $(ncurses5-config --cflags)"  LDFLAGS="-L/usr/%{_lib}/mysql $(ncurses5-config --libs)" ./configure \
6
-./configure \
7
+CFLAGS="-fno-strict-aliasing $RPM_OPT_FLAGS $(ncurses5-config --cflags)"  LDFLAGS="-L/usr/%{_lib}/mysql $(ncurses5-config --libs)" ./configure \
8
    --prefix=%{_prefix} \
9
    --libexecdir=%{_libdir} \
10
         --sbindir=%{_sbindir} \
11
@@ -205,19 +204,20 @@
12
 # ##make CFLAGS="$RPM_OPT_FLAGS"
13
 %{__make}
14
 make DESTDIR=$RPM_BUILD_ROOT install
15
-mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd  $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.mysql
16
+##mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd  $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.mysql
17
 mv $RPM_BUILD_ROOT%{_sbindir}/bacula-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.mysql
18
-mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.mysql
19
+##mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.mysql
20
 mv $RPM_BUILD_ROOT%{_sbindir}/bscan $RPM_BUILD_ROOT%{_sbindir}/bscan.mysql
21
22
 # build postgresql version
23
+%{__make} clean
24
 Build --with-postgresql --with-mysql=no
25
 # ##make CFLAGS="$RPM_OPT_FLAGS"
26
 %{__make}
27
 make DESTDIR=$RPM_BUILD_ROOT install
28
-mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd  $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.postgresql
29
+#mv $RPM_BUILD_ROOT%{_sbindir}/bacula-sd  $RPM_BUILD_ROOT%{_sbindir}/bacula-sd.postgresql
30
 mv $RPM_BUILD_ROOT%{_sbindir}/bacula-dir $RPM_BUILD_ROOT%{_sbindir}/bacula-dir.postgresql
31
-mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.postgresql
32
+#mv $RPM_BUILD_ROOT%{_sbindir}/bcopy $RPM_BUILD_ROOT%{_sbindir}/bcopy.postgresql
33
 mv $RPM_BUILD_ROOT%{_sbindir}/bscan $RPM_BUILD_ROOT%{_sbindir}/bscan.postgresql
34
35
 # build nagios plugin
36
@@ -277,30 +277,30 @@
37
 if [ -f %{_sbindir}/bacula-dir.mysql ] ;then
38
 ln -sf %{_sbindir}/bacula-dir.mysql %{_sbindir}/bacula-dir
39
 fi
40
-if [ -f %{_sbindir}/bacula-sd.mysql ] ; then
41
-ln -sf %{_sbindir}/bacula-sd.mysql %{_sbindir}/bacula-sd
42
-fi
43
+##if [ -f %{_sbindir}/bacula-sd.mysql ] ; then
44
+##ln -sf %{_sbindir}/bacula-sd.mysql %{_sbindir}/bacula-sd
45
+##fi
46
 if [ -f %{_sbindir}/bscan.mysql ] ; then
47
 ln -sf %{_sbindir}/bscan.mysql %{_sbindir}/bscan
48
 fi
49
-if [ -f %{_sbindir}/bcopy.mysql ] ; then
50
-ln -sf %{_sbindir}/bcopy.mysql %{_sbindir}/bcopy
51
-fi
52
+##if [ -f %{_sbindir}/bcopy.mysql ] ; then
53
+##ln -sf %{_sbindir}/bcopy.mysql %{_sbindir}/bcopy
54
+##fi
55
56
57
 %post server-postgresql
58
 if [ -f %{_sbindir}/bacula-dir.postgresql ] ;then
59
 ln -sf %{_sbindir}/bacula-dir.postgresql %{_sbindir}/bacula-dir
60
 fi
61
-if [ -f %{_sbindir}/bacula-sd.postgresql ] ; then
62
-ln -sf %{_sbindir}/bacula-sd.postgresql %{_sbindir}/bacula-sd
63
-fi
64
+##if [ -f %{_sbindir}/bacula-sd.postgresql ] ; then
65
+##ln -sf %{_sbindir}/bacula-sd.postgresql %{_sbindir}/bacula-sd
66
+##fi
67
 if [ -f %{_sbindir}/bscan.postgresql ] ; then
68
 ln -sf %{_sbindir}/bscan.postgresql %{_sbindir}/bscan
69
 fi
70
-if [ -f %{_sbindir}/bcopy.postgresql ] ; then
71
-ln -sf %{_sbindir}/bcopy.postgresql %{_sbindir}/bcopy
72
-fi
73
+##if [ -f %{_sbindir}/bcopy.postgresql ] ; then
74
+##ln -sf %{_sbindir}/bcopy.postgresql %{_sbindir}/bcopy
75
+##fi
76
77
78
 %postun server-mysql
79
@@ -312,13 +312,13 @@
80
 %preun server-mysql
81
 if [ $1 == 0 ] ; then
82
 rm -f %{_sbindir}/bacula-dir
83
-rm -f %{_sbindir}/bacula-sd
84
+##rm -f %{_sbindir}/bacula-sd
85
 fi
86
87
 %preun server-postgresql
88
 if [ $1 == 0 ] ; then
89
 rm -f %{_sbindir}/bacula-dir
90
-rm -f %{_sbindir}/bacula-sd
91
+##rm -f %{_sbindir}/bacula-sd
92
 fi
93
94
95
@@ -361,6 +361,8 @@
96
 %{_sbindir}/btape
97
 %{_sbindir}/bwild
98
 %{_sbindir}/dbcheck
99
+%{_sbindir}/bcopy
100
+%{_sbindir}/bacula-sd
101
 %exclude %{_sbindir}/bacula-sd*
102
 %exclude %{_sbindir}/bacula-dir*
103
 %exclude %{_sbindir}/bscan*
104
@@ -386,17 +388,17 @@
105
106
 %files server-postgresql
107
 %defattr(-,root,root)
108
-%{_sbindir}/bacula-sd.postgresql
109
+##%{_sbindir}/bacula-sd.postgresql
110
 %{_sbindir}/bacula-dir.postgresql
111
 %{_sbindir}/bscan.postgresql
112
-%{_sbindir}/bcopy.postgresql
113
+##%{_sbindir}/bcopy.postgresql
114
115
 %files server-mysql
116
 %defattr(-,root,root)
117
-%{_sbindir}/bacula-sd.mysql
118
+##%{_sbindir}/bacula-sd.mysql
119
 %{_sbindir}/bacula-dir.mysql
120
 %{_sbindir}/bscan.mysql
121
-%{_sbindir}/bcopy.mysql
122
+##%{_sbindir}/bcopy.mysql
123
124
 %files -n libbaccfg-%{_libver}
125
 %defattr(-,root,root)
126
​

Cancel