gil pushed to metadata-extractor2 (master). "update to 2.7.2"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 20 16:14:40 UTC 2015
>From 3658c574975c05b9774467edf035fa1f543ce26d Mon Sep 17 00:00:00 2001
From: gil <puntogil at libero.it>
Date: Mon, 20 Apr 2015 18:14:04 +0200
Subject: update to 2.7.2
diff --git a/metadata-extractor-2.6.4.pom b/metadata-extractor-2.6.4.pom
deleted file mode 100644
index 3229f4c..0000000
--- a/metadata-extractor-2.6.4.pom
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>com.drewnoakes</groupId>
- <artifactId>metadata-extractor</artifactId>
- <version>2.6.4</version>
- <packaging>jar</packaging>
-
- <name>metadata-extractor</name>
- <description>Java library for extracting EXIF, IPTC, XMP, ICC and other metadata from image files.</description>
-
- <url>http://drewnoakes.com/code/exif/</url>
-
- <issueManagement>
- <system>Google Code</system>
- <url>http://code.google.com/p/metadata-extractor/issues/list</url>
- </issueManagement>
-
- <mailingLists>
- <mailingList>
- <name>Announce mailing list</name>
- <archive>http://groups.google.com/group/metadata-extractor-announce</archive>
- </mailingList>
- <mailingList>
- <name>Development mailing list</name>
- <archive>http://groups.google.com/group/metadata-extractor-dev</archive>
- </mailingList>
- <mailingList>
- <name>Changes mailing list</name>
- <archive>http://groups.google.com/group/metadata-extractor-changes</archive>
- </mailingList>
- </mailingLists>
-
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <scm>
- <connection>scm:git:https://code.google.com/p/metadata-extractor/</connection>
- <developerConnection>scm:git:https://code.google.com/p/metadata-extractor/</developerConnection>
- <url>https://code.google.com/p/metadata-extractor/</url>
- </scm>
-
- <developers>
- <developer>
- <id>drewnoakes</id>
- <name>Drew Noakes</name>
- </developer>
- </developers>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.adobe.xmp</groupId>
- <artifactId>xmpcore</artifactId>
- <version>5.1.2</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.8.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <directory>target</directory>
- <outputDirectory>target/classes</outputDirectory>
- <sourceDirectory>Source</sourceDirectory>
- <testSourceDirectory>Tests</testSourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE*</include>
- <include>README*</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>Tests/Data</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>false</addClasspath>
- <mainClass>com.drew.imaging.ImageMetadataReader</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
- <configuration>
- <show>public</show>
- <windowtitle>${project.name} - Javadoc - Extracts Exif, IPTC, XMP, ICC and other metadata from image files</windowtitle>
- <notimestamp>true</notimestamp>
- <bottom><![CDATA[<i>Copyright © 2002-2013 Drew Noakes. All Rights Reserved.</i>]]></bottom>
- <excludePackageNames>com.drew.tools</excludePackageNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/metadata-extractor2.spec b/metadata-extractor2.spec
index cbab238..4da3ed2 100644
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@ -1,21 +1,18 @@
%global majorversion 2
Name: metadata-extractor2
-Version: 2.6.4
-Release: 5%{?dist}
+Version: 2.7.2
+Release: 1%{?dist}
Summary: Extracts EXIF, IPTC and XMP metadata from image files
License: ASL 2.0
URL: http://drewnoakes.com/code/exif/
-Source0: http://metadata-extractor.googlecode.com/files/metadata-extractor-%{version}-src.jar
-# originally taken from http://code.google.com/p/metadata-extractor/source/browse/pom.xml
-# fix javadoc task, jar maifest entries
-Source1: metadata-extractor-%{version}.pom
+Source0: https://github.com/drewnoakes/metadata-extractor/archive/%{version}.tar.gz
+BuildRequires: maven-local
BuildRequires: mvn(com.adobe.xmp:xmpcore)
-BuildRequires: mvn(xerces:xercesImpl)
-# Test deps
BuildRequires: mvn(junit:junit)
-BuildRequires: maven-local
+
Provides: mvn(com.drewnoakes:metadata-extractor) = %{version}-%{release}
+
BuildArch: noarch
%description
@@ -29,12 +26,37 @@ Summary: Javadoc for %{name}
This package contains javadoc for %{name}.
%prep
-%setup -q -c %{name}-%{version}
-rm -r META-INF
+%setup -q -n metadata-extractor-%{version}
find -name '*.jar' -delete
find -name '*.class' -delete
-cp -p %{SOURCE1} pom.xml
+# Unavailable plugins
+%pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
+# Unwanted plugins
+%pom_remove_plugin org.apache.maven.plugins:maven-gpg-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
+# Unneeded task
+%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions"
+# Fix manifest entries
+%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" "<mainClass>com.drew.imaging.ImageMetadataReader</mainClass>"
+# Use standard maven output directory
+%pom_xpath_remove "pom:build/pom:directory"
+%pom_xpath_remove "pom:build/pom:outputDirectory"
+
+# Add OSGi support
+%pom_xpath_set "pom:project/pom:packaging" bundle
+%pom_add_plugin org.apache.felix:maven-bundle-plugin . "
+<extensions>true</extensions>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
# Fix non ASCII chars
for s in Source/com/drew/lang/GeoLocation.java \
@@ -42,14 +64,7 @@ for s in Source/com/drew/lang/GeoLocation.java \
native2ascii -encoding UTF8 ${s} ${s}
done
-# This test fail for unavailable resource
-# java.io.FileNotFoundException: Tests/com/drew/metadata/icc/iccDataInvalid1.app2bytes (No such file or directory)
-rm -r Tests/com/drew/metadata/icc/IccReaderTest.java
-
-sed -i 's/\r//' LICENSE-2.0.txt README.txt
-
-# NoClassDefFound org/w3c/dom/ElementTraversal
-%pom_add_dep xml-apis:xml-apis::test
+sed -i 's/\r//' LICENSE-2.0.txt README.md CONTRIBUTING.md Resources/javadoc-stylesheet.css
%mvn_file :metadata-extractor %{name}
%mvn_alias :metadata-extractor "drew:metadata-extractor"
@@ -66,13 +81,16 @@ sed -i 's/\r//' LICENSE-2.0.txt README.txt
%files -f .mfiles
%{_bindir}/*
-%doc README.txt
+%doc CONTRIBUTING.md README.md
%license LICENSE-2.0.txt
%files javadoc -f .mfiles-javadoc
%license LICENSE-2.0.txt
%changelog
+* Mon Feb 23 2015 gil cattaneo <puntogil at libero.it> 2.7.2-1
+- update to 2.7.2
+
* Tue Feb 10 2015 gil cattaneo <puntogil at libero.it> 2.6.4-5
- introduce license macro
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/metadata-extractor2.git/commit/?h=master&id=3658c574975c05b9774467edf035fa1f543ce26d
More information about the scm-commits
mailing list