diff --git a/mxparser-1.2.2.tar.gz b/mxparser-1.2.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a51397ee9ff0ab7e5b3b809a4216c0f0af91b5f6 Binary files /dev/null and b/mxparser-1.2.2.tar.gz differ diff --git a/mxparser.spec b/mxparser.spec index 0a789ed533d7ab3d5f352888a9c47918075effc7..20b740e29539bd72af90450fdbd81621befb9fd6 100644 --- a/mxparser.spec +++ b/mxparser.spec @@ -1,12 +1,16 @@ Name: mxparser -Version: 1.2.1 -Release: 3 -License: Lab Software License +Version: 1.2.2 +Release: 1 +License: xpp Summary: MXParser is a fork of xpp3_min 1.1.7 containing only the parser with merged changes of the Plexus fork. -URL: http://x-stream.github.io/mxparser -Source0: https://github.com/x-stream/mxparser/archive/refs/tags/v-1.2.1.tar.gz -Source1: settings.xml -BuildRequires: javapackages-local java-javadoc xmlpull maven-local maven +URL: https://github.com/x-stream/%{name} +Source0: %{url}/archive/v-%{version}/%{name}-%{version}.tar.gz +BuildRequires: maven-local +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(xmlpull:xmlpull) BuildArch: noarch %description @@ -18,25 +22,36 @@ Summary: Help documents for mxparser Help documents for mxparser. %prep -%autosetup -n %{name}-v-%{version} -%pom_remove_plugin :maven-bundle-plugin -%pom_remove_plugin :maven-jar-plugin -%pom_remove_plugin :maven-source-plugin -cp -a %{_sourcedir}/settings.xml . +%autosetup -n %{name}-v-%{version} -p1 +%pom_remove_plugin :maven-changes-plugin . +%pom_remove_plugin :maven-javadoc-plugin . +%pom_remove_plugin :maven-source-plugin . + +%pom_xpath_set 'pom:project/pom:properties/pom:version.java.source' 1.8 +%pom_xpath_set 'pom:project/pom:properties/pom:version.java.target' 1.8 +%pom_xpath_set 'pom:project/pom:properties/pom:version.java.test.source' 1.8 +%pom_xpath_set 'pom:project/pom:properties/pom:version.java.test.target' 1.8 %build -mvn install --settings ./settings.xml -Dmaven.test.skip=true -%mvn_build -f -s -b -- -Dversion.java.source=8 +%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %install %mvn_install -%files -f .mfiles-mxparser -%doc changes.xml LICENSE.txt README.md +%files -f .mfiles +%license LICENSE.txt +%doc changes.xml README.md %files help -f .mfiles-javadoc %changelog +* Wed Aug 21 2024 yaoxin - 1.2.2-1 +- Update to 1.2.2: + * XML declaration must produce a START_DOCUMENT event. + * Fix processing of PIs. + * Unit test with subsequent dashes in a PI. + * Replace project license Indiana 1.1.1 with explicit license 1.2 of MXParser. + * Mon Sep 26 2022 caodongxia - 1.2.1-3 - Change mirros.huaweicloud.com to repo.huaweicloud.com diff --git a/mxparser.yaml b/mxparser.yaml new file mode 100644 index 0000000000000000000000000000000000000000..1edfd5fd7f75d93ce12a6fdf3705858263eb1376 --- /dev/null +++ b/mxparser.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: x-stream/mxparser +tag_pattern: "^v-" +seperator: "." diff --git a/settings.xml b/settings.xml deleted file mode 100644 index 8b0778a366fc9f4e609ac61dc2fa456eb0cb616b..0000000000000000000000000000000000000000 --- a/settings.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - huaweicloud - central - central repo - https://repo.huaweicloud.com/repository/maven/ - - - diff --git a/v-1.2.1.tar.gz b/v-1.2.1.tar.gz deleted file mode 100644 index 1c8ac7a74efbb13e3595d6b60d148298f95cc326..0000000000000000000000000000000000000000 Binary files a/v-1.2.1.tar.gz and /dev/null differ