Commit 561888bc94ccbae7890e128e0dc7a0d984e0338b
1 parent
7749ec9d
Exists in
master
and in
3 other branches
Missing build dependencies
Also, separate the `bundle install` step from `make update` to be able to continue previous builds that didn't go all the way.
Showing
3 changed files
with
4 additions
and
202 deletions
Show diff stats
Gemfile.lock
@@ -160,207 +160,6 @@ GEM | @@ -160,207 +160,6 @@ GEM | ||
160 | tins (1.3.3) | 160 | tins (1.3.3) |
161 | treetop (1.4.15) | 161 | treetop (1.4.15) |
162 | polyglot | 162 | polyglot |
163 | - polyglot | ||
164 | - polyglot | ||
165 | - polyglot | ||
166 | - polyglot | ||
167 | - polyglot | ||
168 | - polyglot | ||
169 | - polyglot | ||
170 | - polyglot | ||
171 | - polyglot | ||
172 | - polyglot | ||
173 | - polyglot | ||
174 | - polyglot | ||
175 | - polyglot | ||
176 | - polyglot | ||
177 | - polyglot | ||
178 | - polyglot | ||
179 | - polyglot (>= 0.3.1) | ||
180 | - polyglot (>= 0.3.1) | ||
181 | - polyglot (>= 0.3.1) | ||
182 | - polyglot (>= 0.3.1) | ||
183 | - polyglot (>= 0.3.1) | ||
184 | - polyglot (>= 0.3.1) | ||
185 | - polyglot (>= 0.3.1) | ||
186 | - polyglot (>= 0.3.1) | ||
187 | - polyglot (>= 0.3.1) | ||
188 | - polyglot (>= 0.3.1) | ||
189 | - polyglot (>= 0.3.1) | ||
190 | - polyglot (>= 0.3.1) | ||
191 | - polyglot (>= 0.3.1) | ||
192 | - polyglot (>= 0.3.1) | ||
193 | - polyglot (>= 0.3.1) | ||
194 | - polyglot (>= 0.3.1) | ||
195 | - polyglot (>= 0.3.1) | ||
196 | - polyglot (>= 0.3.1) | ||
197 | - polyglot (>= 0.3.1) | ||
198 | - polyglot (>= 0.3.1) | ||
199 | - polyglot (>= 0.3.1) | ||
200 | - polyglot (>= 0.3.1) | ||
201 | - polyglot (>= 0.3.1) | ||
202 | - polyglot (>= 0.3.1) | ||
203 | - polyglot (>= 0.3.1) | ||
204 | - polyglot (>= 0.3.1) | ||
205 | - polyglot (>= 0.3.1) | ||
206 | - polyglot (>= 0.3.1) | ||
207 | - polyglot (>= 0.3.1) | ||
208 | - polyglot (>= 0.3.1) | ||
209 | - polyglot (>= 0.3.1) | ||
210 | - polyglot (>= 0.3.1) | ||
211 | - polyglot (>= 0.3.1) | ||
212 | - polyglot (>= 0.3.1) | ||
213 | - polyglot (>= 0.3.1) | ||
214 | - polyglot (>= 0.3.1) | ||
215 | - polyglot (>= 0.3.1) | ||
216 | - polyglot (>= 0.3.1) | ||
217 | - polyglot (>= 0.3.1) | ||
218 | - polyglot (>= 0.3.1) | ||
219 | - polyglot (>= 0.3.1) | ||
220 | - polyglot (>= 0.3.1) | ||
221 | - polyglot (>= 0.3.1) | ||
222 | - polyglot (>= 0.3.1) | ||
223 | - polyglot (>= 0.3.1) | ||
224 | - polyglot (>= 0.3.1) | ||
225 | - polyglot (>= 0.3.1) | ||
226 | - polyglot (>= 0.3.1) | ||
227 | - polyglot (>= 0.3.1) | ||
228 | - polyglot (>= 0.3.1) | ||
229 | - polyglot (>= 0.3.1) | ||
230 | - polyglot (>= 0.3.1) | ||
231 | - polyglot (>= 0.3.1) | ||
232 | - polyglot (>= 0.3.1) | ||
233 | - polyglot (>= 0.3.1) | ||
234 | - polyglot (>= 0.3.1) | ||
235 | - polyglot (>= 0.3.1) | ||
236 | - polyglot (>= 0.3.1) | ||
237 | - polyglot (>= 0.3.1) | ||
238 | - polyglot (>= 0.3.1) | ||
239 | - polyglot (>= 0.3.1) | ||
240 | - polyglot (>= 0.3.1) | ||
241 | - polyglot (>= 0.3.1) | ||
242 | - polyglot (>= 0.3.1) | ||
243 | - polyglot (>= 0.3.1) | ||
244 | - polyglot (>= 0.3.1) | ||
245 | - polyglot (>= 0.3.1) | ||
246 | - polyglot (>= 0.3.1) | ||
247 | - polyglot (>= 0.3.1) | ||
248 | - polyglot (>= 0.3.1) | ||
249 | - polyglot (>= 0.3.1) | ||
250 | - polyglot (>= 0.3.1) | ||
251 | - polyglot (>= 0.3.1) | ||
252 | - polyglot (>= 0.3.1) | ||
253 | - polyglot (>= 0.3.1) | ||
254 | - polyglot (>= 0.3.1) | ||
255 | - polyglot (>= 0.3.1) | ||
256 | - polyglot (>= 0.3.1) | ||
257 | - polyglot (>= 0.3.1) | ||
258 | - polyglot (>= 0.3.1) | ||
259 | - polyglot (>= 0.3.1) | ||
260 | - polyglot (>= 0.3.1) | ||
261 | - polyglot (>= 0.3.1) | ||
262 | - polyglot (>= 0.3.1) | ||
263 | - polyglot (>= 0.3.1) | ||
264 | - polyglot (>= 0.3.1) | ||
265 | - polyglot (>= 0.3.1) | ||
266 | - polyglot (>= 0.3.1) | ||
267 | - polyglot (>= 0.3.1) | ||
268 | - polyglot (>= 0.3.1) | ||
269 | - polyglot (>= 0.3.1) | ||
270 | - polyglot (>= 0.3.1) | ||
271 | - polyglot (>= 0.3.1) | ||
272 | - polyglot (>= 0.3.1) | ||
273 | - polyglot (>= 0.3.1) | ||
274 | - polyglot (>= 0.3.1) | ||
275 | - polyglot (>= 0.3.1) | ||
276 | - polyglot (>= 0.3.1) | ||
277 | - polyglot (>= 0.3.1) | ||
278 | - polyglot (>= 0.3.1) | ||
279 | - polyglot (>= 0.3.1) | ||
280 | - polyglot (>= 0.3.1) | ||
281 | - polyglot (>= 0.3.1) | ||
282 | - polyglot (>= 0.3.1) | ||
283 | - polyglot (>= 0.3.1) | ||
284 | - polyglot (>= 0.3.1) | ||
285 | - polyglot (>= 0.3.1) | ||
286 | - polyglot (>= 0.3.1) | ||
287 | - polyglot (>= 0.3.1) | ||
288 | - polyglot (>= 0.3.1) | ||
289 | - polyglot (>= 0.3.1) | ||
290 | - polyglot (>= 0.3.1) | ||
291 | - polyglot (>= 0.3.1) | ||
292 | - polyglot (>= 0.3.1) | ||
293 | - polyglot (>= 0.3.1) | ||
294 | - polyglot (>= 0.3.1) | ||
295 | - polyglot (>= 0.3.1) | ||
296 | - polyglot (>= 0.3.1) | ||
297 | - polyglot (>= 0.3.1) | ||
298 | - polyglot (>= 0.3.1) | ||
299 | - polyglot (>= 0.3.1) | ||
300 | - polyglot (>= 0.3.1) | ||
301 | - polyglot (>= 0.3.1) | ||
302 | - polyglot (>= 0.3.1) | ||
303 | - polyglot (>= 0.3.1) | ||
304 | - polyglot (>= 0.3.1) | ||
305 | - polyglot (>= 0.3.1) | ||
306 | - polyglot (>= 0.3.1) | ||
307 | - polyglot (>= 0.3.1) | ||
308 | - polyglot (>= 0.3.1) | ||
309 | - polyglot (>= 0.3.1) | ||
310 | - polyglot (>= 0.3.1) | ||
311 | - polyglot (>= 0.3.1) | ||
312 | - polyglot (>= 0.3.1) | ||
313 | - polyglot (>= 0.3.1) | ||
314 | - polyglot (>= 0.3.1) | ||
315 | - polyglot (>= 0.3.1) | ||
316 | - polyglot (>= 0.3.1) | ||
317 | - polyglot (>= 0.3.1) | ||
318 | - polyglot (>= 0.3.1) | ||
319 | - polyglot (>= 0.3.1) | ||
320 | - polyglot (>= 0.3.1) | ||
321 | - polyglot (>= 0.3.1) | ||
322 | - polyglot (>= 0.3.1) | ||
323 | - polyglot (>= 0.3.1) | ||
324 | - polyglot (>= 0.3.1) | ||
325 | - polyglot (>= 0.3.1) | ||
326 | - polyglot (>= 0.3.1) | ||
327 | - polyglot (>= 0.3.1) | ||
328 | - polyglot (>= 0.3.1) | ||
329 | - polyglot (>= 0.3.1) | ||
330 | - polyglot (>= 0.3.1) | ||
331 | - polyglot (>= 0.3.1) | ||
332 | - polyglot (>= 0.3.1) | ||
333 | - polyglot (>= 0.3.1) | ||
334 | - polyglot (>= 0.3.1) | ||
335 | - polyglot (>= 0.3.1) | ||
336 | - polyglot (>= 0.3.1) | ||
337 | - polyglot (>= 0.3.1) | ||
338 | - polyglot (>= 0.3.1) | ||
339 | - polyglot (>= 0.3.1) | ||
340 | - polyglot (>= 0.3.1) | ||
341 | - polyglot (>= 0.3.1) | ||
342 | - polyglot (>= 0.3.1) | ||
343 | - polyglot (>= 0.3.1) | ||
344 | - polyglot (>= 0.3.1) | ||
345 | - polyglot (>= 0.3.1) | ||
346 | - polyglot (>= 0.3.1) | ||
347 | - polyglot (>= 0.3.1) | ||
348 | - polyglot (>= 0.3.1) | ||
349 | - polyglot (>= 0.3.1) | ||
350 | - polyglot (>= 0.3.1) | ||
351 | - polyglot (>= 0.3.1) | ||
352 | - polyglot (>= 0.3.1) | ||
353 | - polyglot (>= 0.3.1) | ||
354 | - polyglot (>= 0.3.1) | ||
355 | - polyglot (>= 0.3.1) | ||
356 | - polyglot (>= 0.3.1) | ||
357 | - polyglot (>= 0.3.1) | ||
358 | - polyglot (>= 0.3.1) | ||
359 | - polyglot (>= 0.3.1) | ||
360 | - polyglot (>= 0.3.1) | ||
361 | - polyglot (>= 0.3.1) | ||
362 | - polyglot (>= 0.3.1) | ||
363 | - polyglot (>= 0.3.1) | ||
364 | polyglot (>= 0.3.1) | 163 | polyglot (>= 0.3.1) |
365 | tzinfo (0.3.42) | 164 | tzinfo (0.3.42) |
366 | websocket (1.0.7) | 165 | websocket (1.0.7) |
Makefile
@@ -24,6 +24,9 @@ install: all | @@ -24,6 +24,9 @@ install: all | ||
24 | update: clean | 24 | update: clean |
25 | $(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile | 25 | $(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile |
26 | $(RM) Gemfile.lock | 26 | $(RM) Gemfile.lock |
27 | + $(MAKE) bundle | ||
28 | + | ||
29 | +bundle: | ||
27 | bundle install $(BUNDLE_OPTS) --path vendor/bundle | 30 | bundle install $(BUNDLE_OPTS) --path vendor/bundle |
28 | mkdir -p vendor/cache | 31 | mkdir -p vendor/cache |
29 | rsync -avp --delete --quiet vendor/bundle/*/*/cache/ vendor/cache/ | 32 | rsync -avp --delete --quiet vendor/bundle/*/*/cache/ vendor/cache/ |
noosfero-deps.spec
@@ -7,7 +7,7 @@ License: Various | @@ -7,7 +7,7 @@ License: Various | ||
7 | URL: http://noosfero.org | 7 | URL: http://noosfero.org |
8 | Source0: %{name}-%{version}.tar.gz | 8 | Source0: %{name}-%{version}.tar.gz |
9 | 9 | ||
10 | -BuildRequires: make, gcc, gcc-c++, ruby, ruby-devel, rubygem-bundler, libicu-devel, cmake, mysql-devel, postgresql-devel, ImageMagick-devel | 10 | +BuildRequires: make, gcc, gcc-c++, ruby, ruby-devel, rubygem-bundler, libicu-devel, cmake, mysql-devel, postgresql-devel, ImageMagick-devel, libxml2-devel, libxslt-devel, file-devel |
11 | Requires: ruby, rubygem-bundler | 11 | Requires: ruby, rubygem-bundler |
12 | 12 | ||
13 | %description | 13 | %description |