[hibernate-commons-annotations/f17] update to 4.0.1.Final
Marek Goldmann
goldmann at fedoraproject.org
Tue Jun 26 08:09:39 UTC 2012
commit d06c6b4eb382062946c474f2212ecc024c7e5e6c
Author: gil <puntogil at libero.it>
Date: Fri May 4 11:07:11 2012 +0200
update to 4.0.1.Final
.gitignore | 1 +
...rnate-commons-annotations-4.0.1.Final-pom.patch | 20 ++++++++++
hibernate-commons-annotations.spec | 38 +++++++++++--------
sources | 2 +-
4 files changed, 44 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52140df..cd4f965 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/hibernate-commons-annotations-3.2.0.Final.tar.xz
+/hibernate-commons-annotations-4.0.1.Final.tar.xz
diff --git a/hibernate-commons-annotations-4.0.1.Final-pom.patch b/hibernate-commons-annotations-4.0.1.Final-pom.patch
new file mode 100644
index 0000000..ba6f5f0
--- /dev/null
+++ b/hibernate-commons-annotations-4.0.1.Final-pom.patch
@@ -0,0 +1,20 @@
+--- pom.xml 2011-11-29 18:16:49.000000000 +0100
++++ pom.xml-gil 2012-02-29 21:34:00.348848176 +0100
+@@ -245,7 +245,7 @@
+ <configuration>
+ <compilerArguments>-AloggingVersion=3.0 -AtranslationFilesPath=${project.basedir}/src/main/resources/ -source 1.6 -target 1.6</compilerArguments>
+ <processors>
+- <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
++ <processor>org.jboss.logging.processor.apt.LoggingToolsProcessor</processor>
+ </processors>
+ </configuration>
+ </execution>
+@@ -259,7 +259,7 @@
+ <configuration>
+ <compilerArguments>-AloggingVersion=3.0 -AtranslationFilesPath=${project.basedir}/src/main/resources/ -source 1.6 -target 1.6</compilerArguments>
+ <processors>
+- <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
++ <processor>org.jboss.logging.processor.apt.LoggingToolsProcessor</processor>
+ </processors>
+ </configuration>
+ </execution>
diff --git a/hibernate-commons-annotations.spec b/hibernate-commons-annotations.spec
index 15bf56c..d3bace8 100644
--- a/hibernate-commons-annotations.spec
+++ b/hibernate-commons-annotations.spec
@@ -2,8 +2,8 @@
%global namedversion %{version}%{?namedreltag}
Name: hibernate-commons-annotations
-Version: 3.2.0
-Release: 4%{?dist}
+Version: 4.0.1
+Release: 1%{?dist}
Summary: Hibernate Annotations
Group: Development/Libraries
@@ -15,18 +15,20 @@ License: LGPLv2
URL: http://www.hibernate.org/
# git clone git://github.com/hibernate/hibernate-commons-annotations.git
-# cd hibernate-commons-annotations && git archive --format=tar --prefix=hibernate-commons-annotations-3.2.0.Final/ 3.2.0.Final | xz > hibernate-commons-annotations-3.2.0.Final.tar.xz
+# cd hibernate-commons-annotations && git archive --format=tar --prefix=hibernate-commons-annotations-4.0.1.Final/ 4.0.1.Final | xz > hibernate-commons-annotations-4.0.1.Final.tar.xz
Source0: %{name}-%{namedversion}.tar.xz
-
+# corrects the position of the class LoggingToolsProcessor for the new jboss-logging-tools
+Patch0: hibernate-commons-annotations-4.0.1.Final-pom.patch
BuildArch: noarch
Requires: java
+Requires: jboss-logging
Requires: slf4j
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
+BuildRequires: jboss-logging
+BuildRequires: jboss-logging-tools
BuildRequires: junit
BuildRequires: slf4j
BuildRequires: apache-commons-logging
@@ -34,12 +36,16 @@ BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven
+BuildRequires: maven-processor-plugin
+
BuildRequires: maven-compiler-plugin
+BuildRequires: maven-injection-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
+BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
%description
@@ -61,6 +67,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
+%patch0 -p0
%build
mvn-rpmbuild install javadoc:aggregate
@@ -71,29 +78,28 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}/hibernate
cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/hibernate/%{name}.jar
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.hibernate-%{name}.pom
-
-%add_to_maven_depmap org.hibernate hibernate-commons-annotations %{version} JPP/hibernate %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP.hibernate-%{name}.pom hibernate/%{name}.jar -a "org.hibernate:%{name}"
%files
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_javadir}/*
-%doc changelog.txt readme.txt
+%doc changelog.txt lgpl.txt readme.txt
%files javadoc
%{_javadocdir}/%{name}
+%doc lgpl.txt
%changelog
+* Sun Apr 22 2012 gil cattaneo <puntogil at libero.it> 4.0.1-1
+- update to 4.0.1.Final
+- adapt to current guideline
+- add backward compatibility in depmap
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 5e2e56a..67dfd22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9e229adddede975861bcf6dfb54eb38 hibernate-commons-annotations-3.2.0.Final.tar.xz
+e5886c6ce2eccb45345d82ddeeecd27c hibernate-commons-annotations-4.0.1.Final.tar.xz
More information about the scm-commits
mailing list