commit 3cbd2d468523044eb95f3655a7c3ab7328f482ba
Merge: aaa5e7d 683a0e2
Author: gil <puntogil(a)libero.it>
Date: Wed Apr 2 12:16:05 2014 +0200
use XMvn (#1049586)
metadata-extractor2.spec | 60 +++++----------------------------------------
1 files changed, 7 insertions(+), 53 deletions(-)
---
diff --cc metadata-extractor2.spec
index 897e442,db458fa..22e67d0
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@@ -67,37 -49,15 +49,18 @@@ rm -r Tests/com/drew/metadata/icc/IccRe
sed -i 's/\r//' LICENSE-2.0.txt README.txt
- %patch0 -p0
-
%build
- %if %with_maven
+%mvn_file : %{name}
- %if %{?fedora} > 19
+%mvn_alias : "drew:metadata-extractor"
+%mvn_compat_version : %{version} %{majorversion}
- %endif
+ %mvn_file :metadata-extractor %{name}
+ %mvn_alias :metadata-extractor "drew:metadata-extractor"
+ %mvn_compat_version ":metadata-extractor" %{majorversion}
%mvn_build
- %else
- ant dist-binaries javadoc
- %endif
%install
-
- %if %with_maven && %{?fedora} > 19
%mvn_install
- %else
- mkdir -p %{buildroot}%{_javadir}
- install -m 644 target/metadata-extractor-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}.jar
-
- mkdir -p %{buildroot}%{_mavenpomdir}
- install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
- %add_maven_depmap -a "drew:metadata-extractor" -v "%{majorversion}"
-
- mkdir -p %{buildroot}%{_javadocdir}/%{name}
- cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
- %endif
%jpackage_script com.drew.imaging.ImageMetadataReader "" ""
%{name}-%{majorversion}:xmpcore %{name} true
@@@ -117,10 -69,9 +72,9 @@@
%doc LICENSE-2.0.txt
%changelog
+ * Wed Apr 02 2014 gil cattaneo <puntogil(a)libero.it> 2.6.4-3
-- fix rhbz#1068933
++- fix rhbz#1049586
+
* Mon Oct 21 2013 gil cattaneo <puntogil(a)libero.it> 2.6.4-2
- fix script
Show replies by date