Attachment 582081 Details for Bug 815101 – Test commit

[patch] Test commit

0001-Test-commit.patch (text/plain), 5.54 KB, created by gil cattaneo on 2012-05-04 10:22:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-04 10:22:47 UTC

Size: 5.54 KB

patch

obsolete

>From f5daac084240b90a79f05f4f4f97aac037110033 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Fri, 4 May 2012 10:21:42 +0200
>Subject: [PATCH] Test commit
>
>---
> ...rnate-commons-annotations-4.0.1.Final-pom.patch |   20 ++++++++++
> hibernate-commons-annotations.spec                 |   38 ++++++++++++--------
> 2 files changed, 43 insertions(+), 15 deletions(-)
> create mode 100644 hibernate-commons-annotations-4.0.1.Final-pom.patch
>
>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..c02342b 100644
>--- a/hibernate-commons-annotations.spec
>+++ b/hibernate-commons-annotations.spec
>@@ -3,7 +3,7 @@
> 
> Name:             hibernate-commons-annotations
> Version:          3.2.0
>-Release:          4%{?dist}
>+Release:          2%{?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,30 @@ 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@libero.it> 4.0.1-2
>+- add backward compatibility in depmap
>+
>+* Sun Apr 22 2012 gil cattaneo <puntogil@libero.it> 4.0.1-1
>+- update to 4.0.1.Final
>+- adapt to current guideline
>+
> * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.0-4
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 815101: 579301 | 579302 | 579306 | 582080 | 582081 | 582091 | 582096