Merge Request #244
← To merge requests
From
packaging_noosfero_rails4
into
master
Packaging noosfero rails4
Bumping noosfero versions to 1.5.0-spb3. Adding fix for duplicated noosfero package. Adding fix for preun package spec.
Commits (11)
-
noosfero 1.4.0+spb3 >> 1.5.0+spb1 noosfero-deps 1.4 >> 1.5
- 8 of 11 commits displayed. Click here to show all
Showing
3 changed files
Show diff stats
cookbooks/noosfero/recipes/default.rb
| @@ -11,7 +11,7 @@ package 'noosfero-deps' do | @@ -11,7 +11,7 @@ package 'noosfero-deps' do | ||
| 11 | end | 11 | end |
| 12 | 12 | ||
| 13 | package 'noosfero' do | 13 | package 'noosfero' do |
| 14 | - action :upgrade | 14 | + action :install |
| 15 | notifies :restart, 'service[noosfero]' | 15 | notifies :restart, 'service[noosfero]' |
| 16 | end | 16 | end |
| 17 | 17 |
src/pkg-rpm/noosfero-deps/noosfero-deps.spec
src/pkg-rpm/noosfero/noosfero.spec
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | %define cache_dirs javascripts/cache stylesheets/cache | 2 | %define cache_dirs javascripts/cache stylesheets/cache |
| 3 | 3 | ||
| 4 | Name: noosfero | 4 | Name: noosfero |
| 5 | -Version: 1.3.6+spb7 | 5 | +Version: 1.5.0+spb7 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Summary: Social Networking Platform | 7 | Summary: Social Networking Platform |
| 8 | Group: Applications/Publishing | 8 | Group: Applications/Publishing |
| @@ -10,8 +10,8 @@ License: AGPLv3 | @@ -10,8 +10,8 @@ License: AGPLv3 | ||
| 10 | URL: http://noosfero.org | 10 | URL: http://noosfero.org |
| 11 | Source0: %{name}-%{version}.tar.gz | 11 | Source0: %{name}-%{version}.tar.gz |
| 12 | BuildArch: noarch | 12 | BuildArch: noarch |
| 13 | -BuildRequires: noosfero-deps >= 1.3-3, gettext, po4a | ||
| 14 | -Requires: noosfero-deps, po4a, tango-icon-theme, memcached,crontabs, nodejs | 13 | +BuildRequires: noosfero-deps >= 1.5.1, gettext, po4a |
| 14 | +Requires: noosfero-deps >= 1.5.1, po4a, tango-icon-theme, memcached,crontabs, nodejs | ||
| 15 | 15 | ||
| 16 | %description | 16 | %description |
| 17 | Noosfero is a web platform for social and solidarity economy networks with blog, | 17 | Noosfero is a web platform for social and solidarity economy networks with blog, |
| @@ -28,6 +28,8 @@ ln -sf /usr/lib/noosfero/Gemfile . | @@ -28,6 +28,8 @@ ln -sf /usr/lib/noosfero/Gemfile . | ||
| 28 | ln -sf /usr/lib/noosfero/Gemfile.lock . | 28 | ln -sf /usr/lib/noosfero/Gemfile.lock . |
| 29 | ln -sf /usr/lib/noosfero/.bundle . | 29 | ln -sf /usr/lib/noosfero/.bundle . |
| 30 | ln -sfT /usr/lib/noosfero/vendor/bundle vendor/bundle | 30 | ln -sfT /usr/lib/noosfero/vendor/bundle vendor/bundle |
| 31 | +mkdir tmp | ||
| 32 | +bundle exec rake -f Rakefile.release makemo | ||
| 31 | bundle exec rake -f Rakefile.release noosfero:translations:compile > build.log 2>&1 || (cat build.log; exit 1) | 33 | bundle exec rake -f Rakefile.release noosfero:translations:compile > build.log 2>&1 || (cat build.log; exit 1) |
| 32 | rm -f build.log Gemfile Gemfile.lock .bundle vendor/bundle | 34 | rm -f build.log Gemfile Gemfile.lock .bundle vendor/bundle |
| 33 | rm -rf tmp log | 35 | rm -rf tmp log |
| @@ -99,6 +101,7 @@ production: | @@ -99,6 +101,7 @@ production: | ||
| 99 | database: noosfero_production | 101 | database: noosfero_production |
| 100 | username: noosfero | 102 | username: noosfero |
| 101 | host: localhost | 103 | host: localhost |
| 104 | + | ||
| 102 | port: 5432 | 105 | port: 5432 |
| 103 | EOF | 106 | EOF |
| 104 | 107 | ||
| @@ -161,7 +164,7 @@ fi | @@ -161,7 +164,7 @@ fi | ||
| 161 | 164 | ||
| 162 | %preun | 165 | %preun |
| 163 | service noosfero stop | 166 | service noosfero stop |
| 164 | -chkconfig --del noosfero | 167 | +systemctl disable noosfero |
| 165 | 168 | ||
| 166 | %files | 169 | %files |
| 167 | /usr/lib/noosfero | 170 | /usr/lib/noosfero |
-
Added 1 new commit:
- 426726c1 - Bumps noosfero version to 1.5.0+spb4
-
Added 2 new commits:
- 9fb4984d - SPB release 5.0a13
- 67a31391 - Bumps noosfero version to 1.5.0+spb6
-
Added 1 new commit:
- 6fb6773b - Bumps noosfero version 1.5.0+spb6 >> 1.5.7+spb7
-
Added 1 new commit:
- a1122a60 - Removing the verification of duplicated noosfero pack
-
Added 83 new commits:
- e72c52df - changed import destination from 'blog' to 'noticias'
- 0c390f27 - Removing mezuro from environment
- 3c115609 - Updated portal-description name
- 4c56b5b2 - Removing monitor machine from env
- 39a202f6 - Updating prod repo from v4 to v5
- 62e0879a - Fixed field widget_profile noosfero
- 8ee805f8 - Fix when public software checkbox is unmarked
- cbb9b46f - Fixed CommunityAssociation
- e5ae6190 - Bump colab and colab-deps version
- 7afdb1bd - Removing mezuro plugin from recipe
- a4419f77 - Bumps colab version from 1.13.6 to 1.13.7
- d588fd4a - Fixes admin_notification CSS classes
- 49eb26a7 - Merge branch 'fix_notification_classes' into 'master'
- 51d13ea1 - Fixes software settings translation
- 50282a78 - Added slim header
- e95cf261 - Updated cookboks with slim header
- 90e1d080 - Added button to go back on the navigation
- ab940e51 - Added templatetag to get community-software rel
- 441282a0 - Redirected to community or home
- d5238e74 - Using HTTP_REFERER to go back when in slim header
- c97f0dab - Fix gitlab menu style
- c3fc67c7 - Merge branch 'slim_header' into 'master'
- 7c70e7a1 - Fixes repository link in software creation
- f07efb46 - Changing size of the modal to authorize e-mail visibility
- be81285d - Bumps colab-deps version from 1.13.2 to 1.13.3
- 37b9ba48 - Removing workaround and update configs
- 764b1eac - Refactoring mezuro cookbook
- 2048b9f4 - Modularizing rsyslog into server and default
- 2554f8df - Refactoring the roles files
- 84b44651 - Adding a workaround to the gitlab precompile
- bb7b26cc - Adding a action :upgrade to the packages
- 0c8e0c6e - Adding noosfero_profile widgets to colab cookbook
- 6a206b94 - Removing sentry plugin from colab
- 021ddc87 - Merge branch 'hot-fix-cookbook' into 'master'
- 75092f8d - Removing centos chef repo
- e80487f7 - Merge branch 'remove_chef_repo' into 'master'
- b0c4e2c0 - fix header and form field alignment
- 0d02d66d - Merge branch 'fix_noosfero_search_layout'
- 5310bc35 - SPB release 5.0a12
- a7114f59 - SPB release 5.0a14
- 91b13d2b - Bumps colab version to 1.13.8
- e087a3c0 - SPB release 5.0a15
- fa788037 - Current version of spb
- 652e7b75 - Fixed messages style
- cd482633 - Bumps colab-deps versiont to 1.13.4
- 63c73072 - Fix header css
- 49a8757b - Updating documentation
- 38f6540c - Fixing form in the widget noosfero
- 6acaef96 - Fix the modal min height for many cases - #844
- ddb28dba - Bump colab 1.13.8-1 >> 1.13.9-2
- 510e6ae1 - Fixed header-slim
- e1dce62b - SPB release 5.0a16
- 8b54ad96 - Fixed header-slim mezuro
- 6497a737 - Adding doc for gitlab update
- 3544fc36 - Updating chake version dependecie
- 799311f2 - Updating log message on reverseproxy_ssh_setup script
- f95e628f - Updating dependecies on doc and README
- 1f5fc978 - Fixed CommunityAssociations using None references
- 6381d5d1 - Removing Profile from gitlab plugin
- eb3c2f4b - Fixed css class header-slim
- 20bc4be7 - fix input size of specification tab on software edition page
- b537c7ff - Fix dropdown menu and use jQuery for compatibility
- e758b20c - Merge branch 'fix_colab_profile_dropdown' into 'master'
- e5c603ce - Fix software_events_block with atribute type
- 11443f8d - Change notification plugin in noosfero recipe
- a84121dc - Fix softwares block view
- 76b05779 - Merge branch 'fix_softwares_block' into 'master'
- 48a6c1f8 - Hotfix homepage main-area softwares
- e20cabc9 - Fix style of the form for send e-mail to admins - #861
- 0b2e2c3d - Merge branch 'style_send_mails_to_admins' into 'master'
- 0027c79c - catalog software search "all softwares" by default
- 4ebf8b9c - Bump colab and colab-deps version
- 8d3e6dc4 - Bump noosfero-deps spec version to 1.4
- 45f23931 - Bump noosfero spec version to 1.4.0+spb1
- aafa824f - Bump noosfero spec version to 1.4.0+spb3
- 53e6f348 - Recipe for verify more then one noosfero package and fix spec of noosfero
- 9ad152b1 - Bumping noosfero and noosfero-deps pkg version
- 3da69b2e - Bump noosfero-deps 1.5 >> 1.5.1
- 072a52be - Bump noosfero version from 1.5.0+spb1 >> 1.5.0+spb3
- 935f6228 - Bumps noosfero version to 1.5.0+spb4
- 32a85200 - Bumps noosfero version to 1.5.0+spb6
- 77901c21 - Bumps noosfero version 1.5.0+spb6 >> 1.5.7+spb7
- dda84316 - Removing the verification of duplicated noosfero pack
-
Status changed to closed
