[javapackages] [doc] fix typos in Artifact specification
by Michael Šimáček
commit af5614b2444b1f55d753d5a4e921dda36c0f78ef
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Mon Nov 11 14:54:59 2013 +0100
[doc] fix typos in Artifact specification
doc/jar_file_id_artifact.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/doc/jar_file_id_artifact.txt b/doc/jar_file_id_artifact.txt
index 4b44307..d64adb4 100644
--- a/doc/jar_file_id_artifact.txt
+++ b/doc/jar_file_id_artifact.txt
@@ -1,4 +1,4 @@
-As noted in previous section, every artifact can be uniquly identified
+As noted in previous section, every artifact can be uniquely identified
by its file path. However this is not always the preferred way of
artifact identification.
@@ -6,7 +6,7 @@ Modern Java build systems provide a way of identifying artifacts with
an abstract identifier, or more often a pair of identifiers. The
first if usually called *group ID* or *organization ID* while the
second is just *artifact ID*. This pair of identifiers will be called
-*artifact coordinated* in this document. Besides group ID and
+*artifact coordinates* in this document. Besides group ID and
artifact ID, artifact coordinates may also include other (optional)
information about artifact, such as *extension*, *classifier* or
*version*.
10 years, 7 months
Broken dependencies: hibernate
by Fedora Koji Build System
hibernate has broken dependencies in the rawhide tree:
On x86_64:
hibernate-core-4.3.0-0.2.Beta4.fc21.noarch requires mvn(antlr:antlr:2.7.7)
On i386:
hibernate-core-4.3.0-0.2.Beta4.fc21.noarch requires mvn(antlr:antlr:2.7.7)
On armhfp:
hibernate-core-4.3.0-0.2.Beta4.fc21.noarch requires mvn(antlr:antlr:2.7.7)
Please resolve this as soon as possible.
10 years, 7 months
Broken dependencies: maven-doxia
by Fedora Koji Build System
maven-doxia has broken dependencies in the rawhide tree:
On x86_64:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On i386:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
On armhfp:
maven-doxia-module-itext-1.4-4.fc21.noarch requires mvn(com.lowagie:itext:2.1.7)
Please resolve this as soon as possible.
10 years, 7 months
[Bug 1028931] New: hibertane: Unexpanded variable in manifest
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1028931
Bug ID: 1028931
Summary: hibertane: Unexpanded variable in manifest
Product: Fedora
Version: rawhide
Component: hibernate
Assignee: puntogil(a)libero.it
Reporter: mizdebsk(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: java-sig-commits(a)lists.fedoraproject.org,
puntogil(a)libero.it
Description of problem:
It looks like hibernate-core has unexpanded variable in META-INF/MANIFEST.MF
Version-Release number of selected component (if applicable):
4.3.0-0.2.Beta4
Steps to Reproduce:
open manifest of /usr/share/java/hibernate/hibernate-core.jar
Actual results:
Bundle-Name: hibernate-${m}
Bundle-SymbolicName: org.hibernate.${m}
Bundle-Description: hibernate ${m}
Expected results:
no unexpanded variables (${m})
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=9sQbYbZQnX&a=cc_unsubscribe
10 years, 7 months
[hibernate] fix manifest entries
by gil
commit 4fa07d4ea02b3a0a48f400442d10f0d29eae25bf
Author: gil <puntogil(a)libero.it>
Date: Mon Nov 11 11:45:09 2013 +0100
fix manifest entries
hibernate.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 76 insertions(+), 7 deletions(-)
---
diff --git a/hibernate.spec b/hibernate.spec
index ae5ed40..82ddb0a 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -3,7 +3,7 @@
Name: hibernate
Version: 4.3.0
-Release: 0.3%{namedreltag}%{?dist}
+Release: 0.4%{namedreltag}%{?dist}
Summary: Relational persistence and query service
Group: Development/Libraries
License: LGPLv2+ and ASL 2.0
@@ -279,10 +279,47 @@ pushd hibernate-core
</configuration>
<inherited>true</inherited>"
+%pom_add_plugin org.apache.felix:maven-bundle-plugin . "
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-Description>hibernate core</Bundle-Description>
+ <Bundle-SymbolicName>org.hibernate.core</Bundle-SymbolicName>
+ <Bundle-Name>hibernate-core</Bundle-Name>
+ <Bundle-Vendor>Hibernate.org</Bundle-Vendor>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin . "
+<configuration>
+ <archive>
+ <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifest>
+ <addClasspath>false</addClasspath>
+ <mainClass>org.hibernate.Version</mainClass>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Url>http://hibernate.org</Implementation-Url>
+ <Implementation-Vendor>Hibernate.org</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.hibernate</Implementation-Vendor-Id>
+ <Implementation-Version>\${project.version}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+</configuration>"
+
popd
-#osgi maven-plugin
-for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
+for m in c3p0 ehcache entitymanager envers infinispan osgi proxool testing; do
%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} "
<extensions>true</extensions>
<configuration>
@@ -308,10 +345,6 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
<configuration>
<archive>
<manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- <manifest>
- <addClasspath>false</addClasspath>
- <mainClass>org.hibernate.Version</mainClass>
- </manifest>
<manifestEntries>
<Implementation-Url>http://hibernate.org</Implementation-Url>
<Implementation-Vendor>Hibernate.org</Implementation-Vendor>
@@ -323,6 +356,39 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
done
+%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-maven-plugin "
+<extensions>true</extensions>
+<configuration>
+ <instructions>
+ <Bundle-SymbolicName>org.hibernate.maven-plugin</Bundle-SymbolicName>
+ <Bundle-Name>hibernate-maven-plugin</Bundle-Name>
+ <Bundle-Vendor>Hibernate.org</Bundle-Vendor>
+ <Bundle-Version>\${project.version}</Bundle-Version>
+ </instructions>
+</configuration>
+<executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+</executions>"
+
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin hibernate-maven-plugin "
+<configuration>
+ <archive>
+ <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestEntries>
+ <Implementation-Url>http://hibernate.org</Implementation-Url>
+ <Implementation-Vendor>Hibernate.org</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.hibernate</Implementation-Vendor-Id>
+ <Implementation-Version>\${project.version}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+</configuration>"
+
# Add missing deps
%pom_add_dep "com.fasterxml:classmate" hibernate-core/pom.xml
%pom_add_dep "org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec" hibernate-core/pom.xml
@@ -384,6 +450,9 @@ sed -i "s|org.infinispan.util.FileLookupFactory|org.infinispan.commons.util.File
%doc lgpl.txt LICENSE-2.0.txt
%changelog
+* Mon Nov 11 2013 gil cattaneo <puntogil(a)libero.it> 4.3.0-0.4.Beta4
+- fix manifest entries
+
* Mon Nov 11 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.3.0-0.3.Beta4
- Expand variables in manifest properly (#1028931)
10 years, 7 months
[hibernate] Expand variables in manifest properly (#1028931)
by Stanislav Ochotnicky
commit 8150a9f675f99dd7954dde072e37dd819a4b63ef
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Nov 11 10:51:53 2013 +0100
Expand variables in manifest properly (#1028931)
hibernate.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/hibernate.spec b/hibernate.spec
index 327b326..ae5ed40 100644
--- a/hibernate.spec
+++ b/hibernate.spec
@@ -3,7 +3,7 @@
Name: hibernate
Version: 4.3.0
-Release: 0.2%{namedreltag}%{?dist}
+Release: 0.3%{namedreltag}%{?dist}
Summary: Relational persistence and query service
Group: Development/Libraries
License: LGPLv2+ and ASL 2.0
@@ -283,7 +283,7 @@ popd
#osgi maven-plugin
for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
-%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} '
+%pom_add_plugin org.apache.felix:maven-bundle-plugin hibernate-${m} "
<extensions>true</extensions>
<configuration>
<instructions>
@@ -291,7 +291,7 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
<Bundle-SymbolicName>org.hibernate.${m}</Bundle-SymbolicName>
<Bundle-Name>hibernate-${m}</Bundle-Name>
<Bundle-Vendor>Hibernate.org</Bundle-Vendor>
- <Bundle-Version>${project.version}</Bundle-Version>
+ <Bundle-Version>\${project.version}</Bundle-Version>
</instructions>
</configuration>
<executions>
@@ -302,12 +302,12 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
<goal>manifest</goal>
</goals>
</execution>
-</executions>'
+</executions>"
-%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin hibernate-${m} '
+%pom_add_plugin org.apache.maven.plugins:maven-jar-plugin hibernate-${m} "
<configuration>
<archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ <manifestFile>\${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifest>
<addClasspath>false</addClasspath>
<mainClass>org.hibernate.Version</mainClass>
@@ -316,10 +316,10 @@ for m in core c3p0 ehcache entitymanager envers infinispan proxool testing; do
<Implementation-Url>http://hibernate.org</Implementation-Url>
<Implementation-Vendor>Hibernate.org</Implementation-Vendor>
<Implementation-Vendor-Id>org.hibernate</Implementation-Vendor-Id>
- <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Version>\${project.version}</Implementation-Version>
</manifestEntries>
</archive>
-</configuration>'
+</configuration>"
done
@@ -384,6 +384,9 @@ sed -i "s|org.infinispan.util.FileLookupFactory|org.infinispan.commons.util.File
%doc lgpl.txt LICENSE-2.0.txt
%changelog
+* Mon Nov 11 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.3.0-0.3.Beta4
+- Expand variables in manifest properly (#1028931)
+
* Fri Nov 08 2013 Marek Goldmann <mgoldman(a)redhat.com> - 4.3.0-0.2.Beta4
- Added osgi and maven-plugin modules
- Added OSGi manifests to files
10 years, 7 months
[Bug 1023872] New: org.apache.http.HttpException NCDFE whenever I launch Maven
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023872
Bug ID: 1023872
Summary: org.apache.http.HttpException NCDFE whenever I launch
Maven
Product: Fedora
Version: 20
Component: maven
Severity: urgent
Assignee: sochotni(a)redhat.com
Reporter: lpetrovi(a)redhat.com
QA Contact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org,
mizdebsk(a)redhat.com, msrb(a)redhat.com,
sochotni(a)redhat.com
Whenever I launch Maven on even the most simple projects, I get the following
exception.
I'm assuming this has something to do with the multiple versions of HTTPClient
installed on my system; Maven currently requires both the Jakarta one and the
httpcomponents one.
[WARNING] Error injecting: org.apache.maven.wagon.providers.http.HttpWagon
java.lang.NoClassDefFoundError: org/apache/http/HttpException
at java.lang.Class.getDeclaredConstructors0(Native Method)
at java.lang.Class.privateGetDeclaredConstructors(Class.java:2493)
at java.lang.Class.getDeclaredConstructors(Class.java:1901)
at
com.google.inject.spi.InjectionPoint.forConstructorOf(InjectionPoint.java:245)
at
com.google.inject.internal.ConstructorBindingImpl.create(ConstructorBindingImpl.java:99)
at
com.google.inject.internal.InjectorImpl.createUninitializedBinding(InjectorImpl.java:653)
at
com.google.inject.internal.InjectorImpl.createJustInTimeBinding(InjectorImpl.java:863)
at
com.google.inject.internal.InjectorImpl.createJustInTimeBindingRecursive(InjectorImpl.java:790)
at
com.google.inject.internal.InjectorImpl.getJustInTimeBinding(InjectorImpl.java:278)
at
com.google.inject.internal.InjectorImpl.getBindingOrThrow(InjectorImpl.java:210)
at
com.google.inject.internal.InjectorImpl.getProviderOrThrow(InjectorImpl.java:986)
at
com.google.inject.internal.InjectorImpl.getProvider(InjectorImpl.java:1019)
at
com.google.inject.internal.InjectorImpl.getProvider(InjectorImpl.java:982)
at
com.google.inject.internal.InjectorImpl.getInstance(InjectorImpl.java:1032)
at
org.eclipse.sisu.space.AbstractDeferredClass.get(AbstractDeferredClass.java:48)
at
com.google.inject.internal.ProviderInternalFactory.provision(ProviderInternalFactory.java:86)
at
com.google.inject.internal.InternalFactoryToInitializableAdapter.provision(InternalFactoryToInitializableAdapter.java:55)
at
com.google.inject.internal.ProviderInternalFactory$1.call(ProviderInternalFactory.java:70)
at
com.google.inject.internal.ProvisionListenerStackCallback$Provision.provision(ProvisionListenerStackCallback.java:100)
at
org.eclipse.sisu.plexus.PlexusLifecycleManager.onProvision(PlexusLifecycleManager.java:133)
at
com.google.inject.internal.ProvisionListenerStackCallback$Provision.provision(ProvisionListenerStackCallback.java:109)
at
com.google.inject.internal.ProvisionListenerStackCallback.provision(ProvisionListenerStackCallback.java:55)
at
com.google.inject.internal.ProviderInternalFactory.circularGet(ProviderInternalFactory.java:68)
at
com.google.inject.internal.InternalFactoryToInitializableAdapter.get(InternalFactoryToInitializableAdapter.java:47)
at com.google.inject.internal.InjectorImpl$2$1.call(InjectorImpl.java:997)
at
com.google.inject.internal.InjectorImpl.callInContext(InjectorImpl.java:1047)
at com.google.inject.internal.InjectorImpl$2.get(InjectorImpl.java:993)
at com.google.inject.Scopes$1$1.get(Scopes.java:59)
at org.eclipse.sisu.inject.LazyBeanEntry.getValue(LazyBeanEntry.java:82)
at org.eclipse.sisu.plexus.LazyPlexusBean.getValue(LazyPlexusBean.java:51)
at
org.codehaus.plexus.DefaultPlexusContainer.lookup(DefaultPlexusContainer.java:260)
at
org.codehaus.plexus.DefaultPlexusContainer.lookup(DefaultPlexusContainer.java:252)
at
org.eclipse.aether.internal.transport.wagon.PlexusWagonProvider.lookup(PlexusWagonProvider.java:33)
at
org.eclipse.aether.transport.wagon.WagonTransporter.lookupWagon(WagonTransporter.java:271)
at
org.eclipse.aether.transport.wagon.WagonTransporter.<init>(WagonTransporter.java:115)
at
org.eclipse.aether.transport.wagon.WagonTransporterFactory.newInstance(WagonTransporterFactory.java:137)
at
org.eclipse.aether.internal.impl.DefaultTransporterProvider.newTransporter(DefaultTransporterProvider.java:137)
at
org.eclipse.aether.connector.basic.BasicRepositoryConnector.<init>(BasicRepositoryConnector.java:111)
at
org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory.newInstance(BasicRepositoryConnectorFactory.java:171)
at
org.eclipse.aether.internal.impl.DefaultRepositoryConnectorProvider.newRepositoryConnector(DefaultRepositoryConnectorProvider.java:140)
at
org.eclipse.aether.internal.impl.DefaultArtifactResolver.performDownloads(DefaultArtifactResolver.java:532)
at
org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:437)
at
org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:262)
at
org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifact(DefaultArtifactResolver.java:239)
at
org.apache.maven.repository.internal.DefaultArtifactDescriptorReader.loadPom(DefaultArtifactDescriptorReader.java:314)
at
org.apache.maven.repository.internal.DefaultArtifactDescriptorReader.readArtifactDescriptor(DefaultArtifactDescriptorReader.java:217)
at
org.eclipse.aether.internal.impl.DefaultRepositorySystem.readArtifactDescriptor(DefaultRepositorySystem.java:288)
at
org.apache.maven.plugin.internal.DefaultPluginDependenciesResolver.resolve(DefaultPluginDependenciesResolver.java:108)
at
org.apache.maven.plugin.internal.DefaultMavenPluginManager.getPluginDescriptor(DefaultMavenPluginManager.java:146)
at
org.apache.maven.plugin.internal.DefaultMavenPluginManager.getMojoDescriptor(DefaultMavenPluginManager.java:265)
at
org.apache.maven.plugin.DefaultBuildPluginManager.getMojoDescriptor(DefaultBuildPluginManager.java:190)
at
org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.setupMojoExecution(DefaultLifecycleExecutionPlanCalculator.java:157)
at
org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.setupMojoExecutions(DefaultLifecycleExecutionPlanCalculator.java:144)
at
org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.calculateExecutionPlan(DefaultLifecycleExecutionPlanCalculator.java:121)
at
org.apache.maven.lifecycle.internal.DefaultLifecycleExecutionPlanCalculator.calculateExecutionPlan(DefaultLifecycleExecutionPlanCalculator.java:134)
at
org.apache.maven.lifecycle.internal.BuilderCommon.resolveBuildPlan(BuilderCommon.java:92)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
at
org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at
org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:318)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:153)
at org.apache.maven.cli.MavenCli.execute(MavenCli.java:555)
at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:214)
at org.apache.maven.cli.MavenCli.main(MavenCli.java:158)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289)
at
org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229)
at
org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415)
at
org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356)
Caused by: java.lang.ClassNotFoundException: org.apache.http.HttpException
at
org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
at
org.codehaus.plexus.classworlds.realm.ClassRealm.unsynchronizedLoadClass(ClassRealm.java:259)
at
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:235)
at
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:227)
... 73 more
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=9EHS64C5BG&a=cc_unsubscribe
10 years, 7 months
[metadata-extractor2/f20] switch to ant
by gil
commit aaa5e7d594f88ad613d8b626bf96d010092cca54
Author: gil <puntogil(a)libero.it>
Date: Mon Nov 11 02:09:35 2013 +0100
switch to ant
metadata-extractor-2.6.4-build.patch | 118 ++++++++++++++++++++++++++++++++++
metadata-extractor2.spec | 34 ++++++++--
2 files changed, 146 insertions(+), 6 deletions(-)
---
diff --git a/metadata-extractor-2.6.4-build.patch b/metadata-extractor-2.6.4-build.patch
new file mode 100644
index 0000000..971bfa8
--- /dev/null
+++ b/metadata-extractor-2.6.4-build.patch
@@ -0,0 +1,118 @@
+--- build.xml 2012-12-23 16:37:48.000000000 +0100
++++ build.xml-gil 2013-11-11 02:04:39.619459981 +0100
+@@ -27,18 +27,18 @@
+
+ <property name="library-version" value="2.6.4"/>
+ <property name="java-version" value="1.6"/>
+- <property name="dist" location="Releases"/>
++ <property name="dist" location="target"/>
+ <property name="src" value="Source"/>
+ <property name="output" value="Output/Source"/>
+ <property name="test-src" value="Tests"/>
+ <property name="test-output" value="Output/Tests"/>
+ <property name="sample-src" value="Samples"/>
+- <property name="javadoc" value="Javadoc"/>
++ <property name="javadoc" value="target/site/apidocs"/>
+ <property name="test.reports" value="TestReports"/>
+- <property name="lib" value="Libraries"/>
++ <property name="lib" value="/usr/share/java"/>
+ <property name="verbose" value="true"/>
+ <property name="debug" value="off"/>
+- <property name="classpath" value="${lib}/junit-4.8.2.jar;${lib}/xmpcore.jar"/>
++ <property name="classpath" value="${lib}/junit.jar;${lib}/xmpcore.jar"/>
+
+ <target name="clean" description="deletes and recreates the destination directory">
+ <delete verbose="${verbose}" dir="${output}"/>
+@@ -56,6 +56,7 @@
+ source="${java-version}"
+ target="${java-version}"
+ debug="${debug}"
++ encoding="UTF-8"
+ verbose="${verbose}"/>
+ <javac classpath="${classpath};${output}"
+ srcdir="${test-src}"
+@@ -63,6 +64,7 @@
+ source="${java-version}"
+ target="${java-version}"
+ debug="${debug}"
++ encoding="UTF-8"
+ verbose="${verbose}"/>
+ <!--<copyfile src="LICENSE-2.0.txt" dest="${build}" forceoverwrite="true" />-->
+ </target>
+@@ -75,7 +77,7 @@
+ <pathelement location="${output}"/>
+ <pathelement location="${test-output}"/>
+ <pathelement path="${java.class.path}"/>
+- <pathelement path="${lib}/junit-4.8.2.jar"/>
++ <pathelement path="${lib}/junit.jar"/>
+ <pathelement path="${lib}/xmpcore.jar"/>
+ </classpath>
+ <formatter type="plain"/>
+@@ -91,7 +93,6 @@
+
+ <target name="dist-binaries" depends="clean, compile, test" description="generate binary distribution">
+ <property name="bin-jar" value="${dist}/metadata-extractor-${library-version}.jar" />
+- <property name="bin-zip" value="${dist}/metadata-extractor-${library-version}.zip" />
+ <jar destfile="${bin-jar}" update="false">
+ <manifest>
+ <attribute name="Main-Class" value="com.drew.imaging.ImageMetadataReader"/>
+@@ -100,13 +101,6 @@
+ <file file="LICENSE-2.0.txt" />
+ <file file="README.txt" />
+ </jar>
+- <zip file="${bin-zip}" comment="Metadata Extractor - http://drewnoakes.com/code/exif/">
+- <file file="${bin-jar}" />
+- <file file="${lib}/xmpcore.jar" />
+- <file file="LICENSE-2.0.txt" />
+- <file file="README.txt" />
+- </zip>
+- <delete file="${bin-jar}" />
+ </target>
+
+ <target name="dist-source" depends="clean, compile, test" description="generate source distribution">
+@@ -119,6 +113,10 @@
+
+ <target name="javadoc" description="generate javadoc documentation">
+ <delete verbose="${verbose}" dir="${javadoc}" />
++ <tstamp>
++ <format pattern="yyyy" property="year">
++ </format>
++ </tstamp>
+ <javadoc
+ destdir="${javadoc}"
+ defaultexcludes="yes"
+@@ -126,26 +124,25 @@
+ version="true"
+ use="true"
+ access="protected"
++ encoding="UTF-8"
+ windowtitle="Metadata-Extractor - JavaDoc - An Open Source Java Library for Image File Metadata"
+ failonerror="true">
+ <arg value="-notimestamp" />
+ <!-- be sure to only use single quotes in the CDATA sections below -->
+ <!-- TODO include <link rel='shortcut icon' href='http://metadata-extractor.googlecode.com/git/Resources/metadata-extractor...' /> -->
+- <header><![CDATA[<a href='http://www.drewnoakes.com/code/exif/' title='Go to the project home page.'><img src='http://metadata-extractor.googlecode.com/git/Resources/metadata-extractor...' border="0" alt='Metadata Extractor Logo'></a>]]></header>
+- <bottom><![CDATA[<i>Copyright © 2003-2012 Drew Noakes. All Rights Reserved.</i>
+-<script src='http://www.google-analytics.com/urchin.js' type='text/javascript'></script>
+-<script type='text/javascript'>
+-_uacct = 'UA-936661-1';
+-urchinTracker();
+-</script>]]></bottom>
++ <bottom><![CDATA[<i>Copyright © 2002-${year} Drew Noakes. All Rights Reserved.</i>]]></bottom>
+
+ <packageset dir="${src}" defaultexcludes="yes">
+ <include name="com/**"/>
+ <!--<exclude name="com/**/test"/>-->
+ </packageset>
+-
++ <classpath>
++ <pathelement location="${output}"/>
++ <pathelement location="${dist}/metadata-extractor-${library-version}.jar"/>
++ <pathelement path="${lib}/junit.jar"/>
++ <pathelement path="${lib}/xmpcore.jar"/>
++ </classpath>
+ </javadoc>
+- <copy file="Resources/javadoc-stylesheet.css" tofile="${javadoc}/stylesheet.css" overwrite="yes" />
+ </target>
+
+ <target name="all" depends="dist-source, dist-binaries, javadoc" description="prepare source and binary distributions, and javadoc"/>
diff --git a/metadata-extractor2.spec b/metadata-extractor2.spec
index 7ff2744..897e442 100644
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@ -1,4 +1,8 @@
%global majorversion 2
+# currently in F20 maven build system is broken
+# [DEBUG] Could not find metadata org.fedoraproject.xmvn:xmvn-mojo/maven-metadata.xml in local (/builddir/.m2/repository)
+# [DEBUG] Cannot access central (http://repo.maven.apache.org/maven2) in offline mode and the metadata org.fedoraproject.xmvn:xmvn-mojo/maven-metadata.xml has not been downloaded from it before
+%global with_maven 0
Name: metadata-extractor2
Version: 2.6.4
Release: 2%{?dist}
@@ -10,13 +14,24 @@ Source0: http://metadata-extractor.googlecode.com/files/metadata-extractor
# fix javadoc task, jar maifest entries
Source1: metadata-extractor-%{version}.pom
+# use system libraries
+# fix build dirs structure
+# disable generation of zip archive
+# fix javadoc task
+Patch0: metadata-extractor-%{version}-build.patch
+
BuildRequires: java-devel
BuildRequires: mvn(com.adobe.xmp:xmpcore)
BuildRequires: mvn(xerces:xercesImpl)
# Test deps
BuildRequires: mvn(junit:junit)
+%if %with_maven
BuildRequires: maven-local
+%else
+BuildRequires: ant
+BuildRequires: ant-junit
+%endif
Provides: mvn(com.drewnoakes:metadata-extractor) = %{version}-%{release}
@@ -52,17 +67,24 @@ rm -r Tests/com/drew/metadata/icc/IccReaderTest.java
sed -i 's/\r//' LICENSE-2.0.txt README.txt
+%patch0 -p0
+
%build
-%mvn_file :metadata-extractor %{name}
+%if %with_maven
+%mvn_file : %{name}
%if %{?fedora} > 19
-%mvn_alias :metadata-extractor "drew:metadata-extractor"
-%mvn_compat_version ":metadata-extractor" %{majorversion}
+%mvn_alias : "drew:metadata-extractor"
+%mvn_compat_version : %{version} %{majorversion}
%endif
%mvn_build
+%else
+ant dist-binaries javadoc
+%endif
%install
-%if %{?fedora} > 19
+
+%if %with_maven && %{?fedora} > 19
%mvn_install
%else
mkdir -p %{buildroot}%{_javadir}
@@ -79,7 +101,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%jpackage_script com.drew.imaging.ImageMetadataReader "" "" %{name}-%{majorversion}:xmpcore %{name} true
-%if %{?fedora} > 19
+%if %with_maven && %{?fedora} > 19
%files -f .mfiles
%else
%files
@@ -90,7 +112,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%{_bindir}/*
%doc LICENSE-2.0.txt README.txt
-%if %{?fedora} > 19
+%if %with_maven && %{?fedora} > 19
%files javadoc -f .mfiles-javadoc
%else
%files javadoc
10 years, 7 months
[metadata-extractor2/f20] add provides
by gil
commit f486afa96756b0ecd6c7f871da5e1e46f0d54038
Author: gil <puntogil(a)libero.it>
Date: Sun Nov 10 23:49:23 2013 +0100
add provides
metadata-extractor2.spec | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/metadata-extractor2.spec b/metadata-extractor2.spec
index 1814fda..7ff2744 100644
--- a/metadata-extractor2.spec
+++ b/metadata-extractor2.spec
@@ -17,9 +17,9 @@ BuildRequires: mvn(xerces:xercesImpl)
BuildRequires: mvn(junit:junit)
BuildRequires: maven-local
-%if %{?fedora} <= 19
+
Provides: mvn(com.drewnoakes:metadata-extractor) = %{version}-%{release}
-%endif
+
BuildArch: noarch
%description
10 years, 7 months
Broken dependencies: hibernate
by Fedora Koji Build System
hibernate has broken dependencies in the rawhide tree:
On x86_64:
hibernate-core-4.3.0-0.2.Beta4.fc21.noarch requires mvn(antlr:antlr:2.7.7)
On i386:
hibernate-core-4.3.0-0.2.Beta4.fc21.noarch requires mvn(antlr:antlr:2.7.7)
On armhfp:
hibernate-core-4.3.0-0.2.Beta4.fc21.noarch requires mvn(antlr:antlr:2.7.7)
Please resolve this as soon as possible.
10 years, 7 months
