diff --git a/2.11.0.tar.gz b/metadata-extractor-2.18.0.tar.gz
similarity index 41%
rename from 2.11.0.tar.gz
rename to metadata-extractor-2.18.0.tar.gz
index 7581fb449f72de5e6279004d41ec8f09a100ff93..61adcb79c1c5def56e8156fcbec96207c03d5936 100644
Binary files a/2.11.0.tar.gz and b/metadata-extractor-2.18.0.tar.gz differ
diff --git a/metadata-extractor2.spec b/metadata-extractor2.spec
index 35bbd73d5bd70b5879b3aed60b81c3256dfa3810..2ad4864ca500c32967cd0360935d0221176579d0 100644
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@ -1,13 +1,17 @@
%global majorversion 2
Name: metadata-extractor2
-Version: 2.11.0
+Version: 2.18.0
Release: 1
Summary: Extracts EXIF, IPTC, XMP, ICC and other metadata from image files
License: ASL 2.0
URL: http://drewnoakes.com/code/exif/
-Source0: http://github.com/drewnoakes/metadata-extractor/archive/refs/tags/%{version}.tar.gz
+Source0: https://github.com/drewnoakes/metadata-extractor/archive/%{version}/metadata-extractor-%{version}.tar.gz
+Source1: xmvn-reactor
+
BuildRequires: maven-local mvn(com.adobe.xmp:xmpcore) mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) mvn(org.sonatype.oss:oss-parent:pom:)
+BuildRequires: maven
+
Requires: javapackages-tools
Provides: mvn(com.drewnoakes:metadata-extractor) = %{version}-%{release}
BuildArch: noarch
@@ -24,52 +28,42 @@ This package contains javadoc for %{name}.
%setup -q -n metadata-extractor-%{version}
find -name '*.jar' -delete
find -name '*.class' -delete
+
%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
%pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin
%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
-%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive/pom:manifest/pom:addClasspath" false
-%pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive/pom:manifest" "com.drew.imaging.ImageMetadataReader"
-%pom_xpath_remove "pom:build/pom:directory"
-%pom_xpath_remove "pom:build/pom:outputDirectory"
-%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration/pom:bottom"
-%pom_xpath_set "pom:project/pom:packaging" bundle
-%pom_add_plugin org.apache.felix:maven-bundle-plugin . "
-true
-
-
- bundle-manifest
- process-classes
-
- manifest
-
-
-"
-for s in Source/com/drew/lang/GeoLocation.java \
- Source/com/drew/metadata/icc/IccDescriptor.java;do
- native2ascii -encoding UTF8 ${s} ${s}
-done
-sed -i 's/\r//' LICENSE README.md Resources/javadoc-stylesheet.css
-%mvn_file :metadata-extractor %{name}
-%mvn_alias :metadata-extractor "drew:metadata-extractor"
-%mvn_compat_version ":metadata-extractor" %{majorversion}
+
+cp %{SOURCE1} ./.xmvn-reactor
+echo `pwd` > absolute_prefix.log
+sed -i 's/\//\\\//g' absolute_prefix.log
+absolute_prefix=`head -n 1 absolute_prefix.log`
+sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor
%build
-%mvn_build
+mvn package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
+mkdir -p target/site/apidocs
+mv Output/maven/apidocs target/site/apidocs
%install
%mvn_install
%jpackage_script com.drew.imaging.ImageMetadataReader "" "" %{name}-%{majorversion}:xmpcore %{name} true
-%files -f .mfiles
+%files
%{_bindir}/*
%doc README.md
%license LICENSE
+%attr(0644,root,root) /usr/share/maven-metadata/metadata-extractor2.xml
+%attr(0644,root,root) /usr/share/java/metadata-extractor2/metadata-extractor.jar
+%attr(0644,root,root) /usr/share/maven-poms/metadata-extractor2/metadata-extractor.pom
-%files javadoc -f .mfiles-javadoc
+%files javadoc
%license LICENSE
+/usr/share/javadoc/metadata-extractor2
%changelog
+* Thu Aug 10 2023 xu_ping <707078654@qq.com> - 2.18.0-1
+- Update to 2.18.0
+
* Mon May 30 2022 xigaoxinyan - 2.11.0-1
- Update to 2.11.0
diff --git a/xmvn-reactor b/xmvn-reactor
new file mode 100644
index 0000000000000000000000000000000000000000..32c09c7d9078f7c3c1a944c9713d041b7f1877a8
--- /dev/null
+++ b/xmvn-reactor
@@ -0,0 +1,40 @@
+
+
+
+
+ com.drewnoakes
+ metadata-extractor
+ 2.18.0
+ absolute-prefix/Output/maven/metadata-extractor-2.18.0.jar
+
+ bundle
+ 1.6
+
+
+
+ com.adobe.xmp
+ xmpcore
+ 5.1.3
+
+
+
+
+ com.drewnoakes
+ metadata-extractor
+ pom
+ 2.18.0
+ absolute-prefix/pom.xml
+
+ bundle
+ 1.6
+
+
+
+ com.adobe.xmp
+ xmpcore
+ 5.1.3
+
+
+
+
+