Commit 1e37ce6916655072bf64ccd2361852f00c5c8216

Authored by Macartur Sousa
1 parent 9ee75ff7
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Update noosfero-deps, noosfero-spb.spec e noosfero.spec

specs/noosfero/noosfero-deps.spec
1 Name: noosfero-deps 1 Name: noosfero-deps
2 -Version: 1.1 2 +Version: 1.2
3 Release: 1%{?dist} 3 Release: 1%{?dist}
4 Summary: Ruby dependencies for Noosfero 4 Summary: Ruby dependencies for Noosfero
5 Group: Development/Tools 5 Group: Development/Tools
specs/noosfero/noosfero-spb.spec
1 Name: noosfero-spb 1 Name: noosfero-spb
2 -Version: 3 2 +Version: 3.3
3 Release: 1%{?dist} 3 Release: 1%{?dist}
4 Summary: SPB-specific Noosfero plugins and themes 4 Summary: SPB-specific Noosfero plugins and themes
5 Group: Applications/Publishing 5 Group: Applications/Publishing
specs/noosfero/noosfero.spec
@@ -9,12 +9,9 @@ Group: Applications/Publishing @@ -9,12 +9,9 @@ Group: Applications/Publishing
9 License: AGPLv3 9 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 -Patch0: 0001-Use-as-placeholder-for-current-user-in-URLs.patch  
13 -Patch1: 0001-Enhance-existing-backup-task-and-add-a-restore-one.patch  
14 -Patch2: 0001-Fix-backup-task.patch  
15 BuildArch: noarch 12 BuildArch: noarch
16 BuildRequires: noosfero-deps, gettext, po4a 13 BuildRequires: noosfero-deps, gettext, po4a
17 -Requires: noosfero-deps, po4a, tango-icon-theme, memcached,crontabs 14 +Requires: noosfero-deps, po4a, tango-icon-theme, memcached,crontabs, nodejs
18 15
19 %description 16 %description
20 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,
@@ -25,10 +22,6 @@ participate and contribute to this free software project! @@ -25,10 +22,6 @@ participate and contribute to this free software project!
25 %prep 22 %prep
26 %setup -q 23 %setup -q
27 24
28 -%patch0 -p1  
29 -%patch1 -p1  
30 -%patch2 -p1  
31 -  
32 %build 25 %build
33 26
34 ln -sf /usr/lib/noosfero/Gemfile . 27 ln -sf /usr/lib/noosfero/Gemfile .