Skip to content
This repository was archived by the owner on Aug 23, 2019. It is now read-only.

6.2.33 beta 2 #34

Merged
merged 1 commit into from
Jul 1, 2018
Merged

6.2.33 beta 2 #34

merged 1 commit into from
Jul 1, 2018

Conversation

ikedas
Copy link
Owner

@ikedas ikedas commented Jun 23, 2018

Updates according to changes on upstream:

  • #170 WWSympa: Switch to Foundation 6
  • #220 static_content directory structure
  • #336 Starting a test framework

@@ -76,6 +75,7 @@ BuildRequires: perl(Cwd)
BuildRequires: perl(Data::Password)
BuildRequires: perl(DateTime)
BuildRequires: perl(DateTime::Format::Mail)
BuildRequires: perl(DBD::SQLite)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is a new requirement from the test suite ?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is used by a new test t/02_Sympa_DatabaseManager.t in sympa-community/sympa#336

sympa.spec Outdated
Provides: bundled(js-modernizr) = 2.8.3
Provides: bundled(js-placeholder) = 2.0.9
Provides: bundled(js-sizzle) = 2.2.0
%endif
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This part shouldn't be removed but updated for foundation 6:

%if %{unbundle_foundation}
Requires:    js-foundation6
%else
Provides:    bundled(js-foundation) = 6.4.2
# Bundled in bundled js-foundation
Provides:    bundled(js-what-input) = 4.2.0
%endif

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I repushed commits according to your suggestion.

sympa.spec Outdated

Name: sympa
Version: 6.2.32
Version: 6.2.33
Release: %{?pre_rel:0.}2%{?pre_rel:.%pre_rel}%{?dist}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick, the '2' in the release field above should be '1' and the corresponding change should be applied to the changelog entry.
The release field needs to be reset to 1 (or 0.1 for a pre-release, but here the macros in the release field take care of the leading '0.' automagically) each time the version field is incremented (and also when the software goes from a pre-release to the final release, but this is not the case with Sympa, as next stable will be 6.2.34).

@ikedas
Copy link
Owner Author

ikedas commented Jul 1, 2018

I understood. I re-pushed.

@xavierba xavierba merged commit 6ddf63d into master Jul 1, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants