diff --git a/0001-add-javadoc-plugin.patch b/0001-add-javadoc-plugin.patch new file mode 100644 index 0000000..1f66f1e --- /dev/null +++ b/0001-add-javadoc-plugin.patch @@ -0,0 +1,37 @@ +From b848e43ee6ab4a609e886ed56c5400979cce43d2 Mon Sep 17 00:00:00 2001 +From: wang--ge +Date: Mon, 24 Jan 2022 17:12:06 +0800 +Subject: [PATCH] add javadoc plugin + +--- + pom.xml | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/pom.xml b/pom.xml +index ebd8723..983c90d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -95,5 +95,20 @@ + + + ++ ++ ++ org.apache.maven.plugins ++ maven-javadoc-plugin ++ 3.0.0-M1 ++ ++ ++ attach-javadoc ++ ++ jar ++ ++ ++ ++ ++ + + +-- +2.30.0 + diff --git a/1.2.1.tar.gz b/1.2.1.tar.gz deleted file mode 100644 index 57c5d88..0000000 Binary files a/1.2.1.tar.gz and /dev/null differ diff --git a/1.3.tar.gz b/1.3.tar.gz new file mode 100644 index 0000000..e3fc9fb Binary files /dev/null and b/1.3.tar.gz differ diff --git a/evo-inflector.spec b/evo-inflector.spec index 1a66fb0..7961816 100644 --- a/evo-inflector.spec +++ b/evo-inflector.spec @@ -1,11 +1,13 @@ Name: evo-inflector -Version: 1.2.1 -Release: 10 +Version: 1.3 +Release: 1 Summary: Implements English pluralization algorithm License: ASL 2.0 URL: https://github.com/atteo/evo-inflector Source0: https://github.com/atteo/evo-inflector/archive/%{version}.tar.gz -BuildRequires: mvn(org.apache.ant:ant) mvn(junit:junit) maven-local +Patch0: 0001-add-javadoc-plugin.patch +BuildRequires: maven-local maven java-1.8.0-openjdk-devel +Requires: java-1.8.0-openjdk BuildArch: noarch %description Evo Inflector implements English pluralization algorithm @@ -18,26 +20,42 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q +%autosetup -p1 find . -name "*.jar" -print -delete find . -name "*.class" -print -delete -%pom_remove_parent + +#%%pom_remove_parent %pom_xpath_inject pom:project "org.atteo" %mvn_file :%{name} %{name} %build -%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 +#%%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 +mvn package -Dproject.build.sourceEncoding=UTF-8 -DskipTests %install -%mvn_install +#%%mvn_install +install -d -m 0755 %{buildroot}%{_javadir} +install -d -m 0755 %{buildroot}%{_mavenpomdir} +install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} +install -pm 0644 target/evo-inflector-%{version}-javadoc.jar %{buildroot}%{_javadocdir}/%{name} +install -pm 0644 target/evo-inflector-%{version}.jar %{buildroot}%{_javadir}/evo-inflector.jar +install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/evo-inflector.pom +%add_maven_depmap %{name}.pom %{name}.jar -%files -f .mfiles +%files +%attr(0644,root,root) %{_datadir}/maven-metadata/evo-inflector.xml +%attr(0644,root,root) %{_javadir}/evo-inflector.jar +%attr(0644,root,root) %{_mavenpomdir}/evo-inflector.pom %doc README.md %license LICENSE -%files javadoc -f .mfiles-javadoc +%files javadoc +%{_javadocdir}/%{name} %license LICENSE %changelog +* Thu Jan 20 2022 SimpleUpdate Robot - 1.3-1 +- Upgrade to version 1.3 + * Mon Jul 27 2020 Anan Fu - 1.2.1-10 - package init