Merge branch 'master' of portal.softwarepublico.gov.br:softwarepublico/softwarepublico into copr

Sergio Oliveira
2 parents 9dcf69f7 b8370d9c
Showing 20 changed files with 39 additions and 20 deletions Show diff stats
docs/Makefile
src/noosfero-spb/Makefile
src/pkg-rpm/bottle/bottle.spec
src/pkg-rpm/colab-deps/colab-deps.spec
src/pkg-rpm/colab-spb-theme/colab-spb-theme.spec
src/pkg-rpm/colab/colab.spec
src/pkg-rpm/fcgi/fcgi.spec
src/pkg-rpm/fcgiwrap/fcgiwrap.spec
src/pkg-rpm/gitlab-deps/gitlab-deps.spec
src/pkg-rpm/gitlab-shell/gitlab-shell.spec
src/pkg-rpm/gitlab/gitlab.spec
src/pkg-rpm/libev/libev.spec
src/pkg-rpm/mailman-api/mailman-api.spec
src/pkg-rpm/noosfero-deps/noosfero-deps.spec
src/pkg-rpm/noosfero-spb/noosfero-spb.spec
src/pkg-rpm/noosfero/noosfero.spec
src/pkg-rpm/redis/redis.spec
src/pkg-rpm/solr/solr.spec
src/pkg-rpm/spawn-fcgi/spawn-fcgi.spec
src/pkg-rpm/tango-icon-theme/tango-icon-theme.spec
@@ -6,27 +6,33 @@ all:
  
 SPB_ENV ?= local
  
+build_dir = _build/$(SPB_ENV)
+
 # autogenerated DNS documentation
-BUILT += _build/dns.rst
-_build/dns.rst: ../test/dns_test.sh
+BUILT += $(build_dir)/dns.rst
+$(build_dir)/dns.rst: ../test/dns_test.sh
+	mkdir -p $(build_dir)
 	(cd .. && sh test/dns_test.sh --doc) > $@
  
-BUILT += $(patsubst %.svg, _build/%.png, $(wildcard *.svg))
-_build/%.png: %.png
+BUILT += $(patsubst %.svg, $(build_dir)/%.png, $(wildcard *.svg))
+$(build_dir)/%.png: %.png
+	mkdir -p $(build_dir)
 	cp $< $@
  
 arquitetura.png:
 	inkscape --export-area-page --export-width=800 --export-width=600 --export-png=$@ $<
  
-BUILT += $(patsubst %.in, _build/%, $(wildcard *.in))
-_build/%: %.in build.rb
+BUILT += $(patsubst %.in, $(build_dir)/%, $(wildcard *.in))
+$(build_dir)/%: %.in build.rb
+	mkdir -p $(build_dir)
 	ruby -p build.rb $< > $@ || ($(RM) $@; false)
  
 CLEAN_FILES += $(BUILT)
  
 html latexpdf: $(BUILT)
-	$(MAKE) -C _build $@ BUILDDIR=$(SPB_ENV)
+	mkdir -p $(build_dir)
+	$(MAKE) -C $(build_dir) -f ../Makefile $@
  
 clean:
 	$(RM) $(BUILT)
-	$(MAKE) -C _build $@
+	$(RM) -r $(build_dir)
 PACKAGE = noosfero-spb
-VERSION = 4.2
+VERSION = 4.2.1
 DISTDIR = $(PACKAGE)-$(VERSION)
 TARBALL = $(DISTDIR).tar.gz
  
@@ -7,6 +7,7 @@
 Summary: Fast and simple WSGI-framework for small web-applications.
 Name: %{name}
 Version: %{version}
+Release: 4.1
 Source0: %{name}-%{unmangled_version}.tar.gz
 License: MIT
 Group: Development/Libraries
 Summary: Collaboration platform for communities (Python dependencies)
 Name:    colab-deps
 Version: 1.11.3
-Release: 0
+Release: 25.1
 Source0: colab-deps-%{version}.tar.gz
 License: Various
 Group: Development/Tools
  
 Name:           colab-spb-theme
 Version:        0.2.0
+Release:        9.1
 Summary:        SPB-specific Colab theme
 License:        GPL-3.0
 Group:          Applications/Publishing
@@ -7,7 +7,7 @@
 Summary: Collaboration platform for communities
 Name: %{name}
 Version: %{version}
-Release: 0
+Release: 18.1
 Source0: %{name}-%{version}.tar.gz
 License: GPLv2
 Group: Development/Tools
@@ -2,6 +2,7 @@
  
 Name:           fcgi
 Version:        2.4.0
+Release:        23.1
 Summary:        FastCGI development kit
  
 Group:          Development/Languages
 %global gitcommit 333ff99
 Name:           fcgiwrap
 Version:        1.1.0
+Release:        3
 Summary:        Simple FastCGI wrapper for CGI scripts
 License:        MIT
 URL:            http://nginx.localdomain.pl/
@@ -8,7 +9,7 @@ Group:          System Environment/Daemons
  
 Source0:        fcgiwrap-%{version}.tar.gz
  
-BuildRequires:      autoconf
+BuildRequires:      automake
 BuildRequires:      fcgi-devel
 Requires:           spawn-fcgi
  
 Name:    gitlab-deps
 Version: 7.5.4
+Release: 2.1
 Summary: Ruby dependencies for Gitlab
 Group:   Development/Tools
 License: Various
 Name:		gitlab-shell
 Version:	2.4.0
+Release:	5.1
 Summary:	Software Development Platform
  
 Group:		Development/Tools
 Name:    gitlab
 Version: 7.6.2
+Release: 13.1
 Summary: Software Development Platform
 Group:   Development/Tools
 License: Expat
@@ -4,6 +4,7 @@
 Name:             libev
 Summary:          High-performance event loop/event model with lots of features
 Version:          4.15
+Release:          5.1
 License:          BSD or GPLv2+
 URL:              http://software.schmorp.de/pkg/libev.html
 Source0:          http://dist.schmorp.de/libev/Attic/%{name}-%{version}.tar.gz
 %define name mailman-api
-%define version 0.3c1
-%define unmangled_version 0.3c1
-%define release 10
+%define version 0.3rc2
+%define unmangled_version 0.3rc2
  
 Summary: REST API daemon to interact with Mailman 2
 Name: %{name}
@@ -15,8 +14,9 @@ BuildArch: noarch
 Vendor: Sergio Oliveira <sergio@tracy.com.br>
 Requires: mailman, python >= 2.7, python-paste >= 1.7.5.1, bottle >= 0.11.6
 Url: http://pypi.python.org/pypi/mailman-api/
-
+Release:  10
 BuildRequires: python >= 2.7, python-devel >= 2.7, python-setuptools >= 0.9.8
+BuildRequires: systemd-units
  
 %description
 mailman-api
 Name:    noosfero-deps
 Version: 1.3
+Release: 5.1
 Summary: Ruby dependencies for Noosfero
 Group:   Development/Tools
 License: Various
 Name:    noosfero-spb
-Version: 4.2
-Release: 0
+Version: 4.2.1
+Release: 9.1
 Summary: SPB-specific Noosfero plugins and themes
 Group:   Applications/Publishing
 License: AGPLv3
@@ -2,8 +2,8 @@
 %define cache_dirs javascripts/cache stylesheets/cache
  
 Name:    noosfero
-Version: 1.3.1+spb1
-Release: 0
+Version: 1.3.1+spb2
+Release: 6.1
 Summary: Social Networking Platform
 Group:   Applications/Publishing
 License: AGPLv3
@@ -2,6 +2,7 @@
 Summary: redis
 Name: redis
 Version: 2.8.17
+Release: 2.1
 License: BSD
 Group: Applications/Multimedia
 URL: http://redis.io/
@@ -7,6 +7,7 @@
 Summary: Solr is the search platform from Apache Lucene project.
 Name: solr
 Version: 4.6.1
+Release: 2.1
  
 License: Apache License, Version 2.0
 Group: Applications/Internet
 Summary: Simple program for spawning FastCGI processes
 Name: spawn-fcgi
 Version: 1.6.3
+Release: 6.1
 License: BSD
 Group: System Environment/Daemons
 URL: http://redmine.lighttpd.net/projects/spawn-fcgi/
@@ -2,6 +2,7 @@
  
 Name: tango-icon-theme
 Version: 0.8.90
+Release: 2.1
  
 Summary: Tango Icon Library
 License: Creative Commons Attribution Share-Alike license 2.5
...	...	@@ -6,27 +6,33 @@ all:
6	6
7	7	SPB_ENV ?= local
8	8
	9	+build_dir = _build/$(SPB_ENV)
	10	+
9	11	# autogenerated DNS documentation
10		-BUILT += _build/dns.rst
11		-_build/dns.rst: ../test/dns_test.sh
	12	+BUILT += $(build_dir)/dns.rst
	13	+$(build_dir)/dns.rst: ../test/dns_test.sh
	14	+ mkdir -p $(build_dir)
12	15	(cd .. && sh test/dns_test.sh --doc) > $@
13	16
14		-BUILT += $(patsubst %.svg, _build/%.png, $(wildcard *.svg))
15		-_build/%.png: %.png
	17	+BUILT += $(patsubst %.svg, $(build_dir)/%.png, $(wildcard *.svg))
	18	+$(build_dir)/%.png: %.png
	19	+ mkdir -p $(build_dir)
16	20	cp $< $@
17	21
18	22	arquitetura.png:
19	23	inkscape --export-area-page --export-width=800 --export-width=600 --export-png=$@ $<
20	24
21		-BUILT += $(patsubst %.in, _build/%, $(wildcard *.in))
22		-_build/%: %.in build.rb
	25	+BUILT += $(patsubst %.in, $(build_dir)/%, $(wildcard *.in))
	26	+$(build_dir)/%: %.in build.rb
	27	+ mkdir -p $(build_dir)
23	28	ruby -p build.rb $< > $@ \|\| ($(RM) $@; false)
24	29
25	30	CLEAN_FILES += $(BUILT)
26	31
27	32	html latexpdf: $(BUILT)
28		- $(MAKE) -C _build $@ BUILDDIR=$(SPB_ENV)
	33	+ mkdir -p $(build_dir)
	34	+ $(MAKE) -C $(build_dir) -f ../Makefile $@
29	35
30	36	clean:
31	37	$(RM) $(BUILT)
32		- $(MAKE) -C _build $@
	38	+ $(RM) -r $(build_dir)
...	...
1	1	PACKAGE = noosfero-spb
2		-VERSION = 4.2
	2	+VERSION = 4.2.1
3	3	DISTDIR = $(PACKAGE)-$(VERSION)
4	4	TARBALL = $(DISTDIR).tar.gz
5	5
...	...
...	...	@@ -7,6 +7,7 @@
7	7	Summary: Fast and simple WSGI-framework for small web-applications.
8	8	Name: %{name}
9	9	Version: %{version}
	10	+Release: 4.1
10	11	Source0: %{name}-%{unmangled_version}.tar.gz
11	12	License: MIT
12	13	Group: Development/Libraries
...	...
1	1	Summary: Collaboration platform for communities (Python dependencies)
2	2	Name: colab-deps
3	3	Version: 1.11.3
4		-Release: 0
	4	+Release: 25.1
5	5	Source0: colab-deps-%{version}.tar.gz
6	6	License: Various
7	7	Group: Development/Tools
...	...
1	1
2	2	Name: colab-spb-theme
3	3	Version: 0.2.0
	4	+Release: 9.1
4	5	Summary: SPB-specific Colab theme
5	6	License: GPL-3.0
6	7	Group: Applications/Publishing
...	...
...	...	@@ -7,7 +7,7 @@
7	7	Summary: Collaboration platform for communities
8	8	Name: %{name}
9	9	Version: %{version}
10		-Release: 0
	10	+Release: 18.1
11	11	Source0: %{name}-%{version}.tar.gz
12	12	License: GPLv2
13	13	Group: Development/Tools
...	...
...	...	@@ -2,6 +2,7 @@
2	2
3	3	Name: fcgi
4	4	Version: 2.4.0
	5	+Release: 23.1
5	6	Summary: FastCGI development kit
6	7
7	8	Group: Development/Languages
...	...
1	1	%global gitcommit 333ff99
2	2	Name: fcgiwrap
3	3	Version: 1.1.0
	4	+Release: 3
4	5	Summary: Simple FastCGI wrapper for CGI scripts
5	6	License: MIT
6	7	URL: http://nginx.localdomain.pl/
...	...	@@ -8,7 +9,7 @@ Group: System Environment/Daemons
8	9
9	10	Source0: fcgiwrap-%{version}.tar.gz
10	11
11		-BuildRequires: autoconf
	12	+BuildRequires: automake
12	13	BuildRequires: fcgi-devel
13	14	Requires: spawn-fcgi
14	15
...	...
1	1	Name: gitlab-deps
2	2	Version: 7.5.4
	3	+Release: 2.1
3	4	Summary: Ruby dependencies for Gitlab
4	5	Group: Development/Tools
5	6	License: Various
...	...
1	1	Name: gitlab-shell
2	2	Version: 2.4.0
	3	+Release: 5.1
3	4	Summary: Software Development Platform
4	5
5	6	Group: Development/Tools
...	...