#1 Update to upstream version 1.9.1
Merged 4 years ago by decathorpe. Opened 5 years ago by mkoncek.
rpms/ mkoncek/maven-doxia-sitetools update-version  into  master

file modified
+1
@@ -9,3 +9,4 @@ 

  /doxia-sitetools-1.7.3-source-release.zip

  /doxia-sitetools-1.7.4-source-release.zip

  /doxia-sitetools-1.7.5-source-release.zip

+ /doxia-sitetools-1.9.1-source-release.zip

file modified
+9 -9
@@ -1,12 +1,11 @@ 

- %bcond_with     markdown

  %bcond_without  fop

  

  %global parent maven-doxia

  %global subproj sitetools

  

  Name:           %{parent}-%{subproj}

- Version:        1.7.5

- Release:        6%{?dist}

+ Version:        1.9.1

+ Release:        1%{?dist}

  Summary:        Doxia content generation framework

  License:        ASL 2.0

  URL:            http://maven.apache.org/doxia/
@@ -28,11 +27,9 @@ 

  %if %{with fop}

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-fo)

  %endif

- %if %{with markdown}

- BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-markdown)

- %endif

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xdoc)

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml)

+ BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml5)

  BuildRequires:  mvn(org.apache.maven.doxia:doxia-sink-api)

  BuildRequires:  mvn(org.apache.maven:maven-artifact)

  BuildRequires:  mvn(org.apache.maven:maven-artifact:2.2.1)
@@ -97,9 +94,8 @@ 

  rm -rf $(find -type d -name itext)

  %pom_remove_dep -r :doxia-module-itext

  

- %if %{without markdown}

  %pom_remove_dep -r :doxia-module-markdown

- %endif

+ 

  %if %{without fop}

  %pom_remove_dep -r :doxia-module-fo

  rm -r doxia-doc-renderer/src/main/java/org/apache/maven/doxia/docrenderer/pdf/fo
@@ -114,13 +110,17 @@ 

  %install

  %mvn_install

  

- 

  %files -f .mfiles

  %dir %{_javadir}/%{name}

+ %doc LICENSE NOTICE

  

  %files javadoc -f .mfiles-javadoc

+ %doc LICENSE NOTICE

  

  %changelog

+ * Mon Sep 02 2019 Marian Koncek <mkoncek@redhat.com> - 1.9.1-1

+ - Update to upstream version 1.9.1

+ 

  * Mon Sep 02 2019 Fabio Valentini <decathorpe@gmail.com> - 1.7.5-6

  - Disable support for markdown.

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- SHA512 (doxia-sitetools-1.7.5-source-release.zip) = c15b0fe8325e49594691b54a2728fe43b26a7c012e35e907cd3f27680eb0332ed09d01b307a9a146a4a4780a53136146eb5aa12b0a79ca263dbf62c87e28ce3c

+ SHA512 (doxia-sitetools-1.9.1-source-release.zip) = 1cb855fde7e313603b9c7574c6f8db66c17ec190325519c0d0cb23a7566ba7eb41bdc5009e4c8a2ce9c069ae1b8781bfdde675d5dfa61097f9db2a6d58a95b46

The patch changes are made because of the upstream change in line endings

Looks sane. Would like to take this package?

rebased onto 8aeacf1

5 years ago

Version 1.9 of this project has been released. Would you be interested in updating your PR accordingly?

rebased onto 85e0d7a

4 years ago

@decathorpe Rebased. I could not test it locally, since I could not install maven-doxia 1.9 for some reason. However the changes are basically the same as in MBI.

@mkoncek We need to disable markdown support in maven-doxia-sitetools before we can do the rest. Because maven-doxia 1.9 BuildRequires the old maven-doxia-sitetools, which still requires maven-doxia with the markdown module.

@mkoncek I fixed the maven-doxia build, now maven-doxia-sitetools will need this line:

BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml5)

@mkoncek sorry to bother you again, but can you rebase this PR and add this line:

BuildRequires:  mvn(org.apache.maven.doxia:doxia-module-xhtml5)

Thanks.

rebased onto 0b96bac

4 years ago

Pull-Request has been merged by decathorpe

4 years ago