[bval/f17] Don't use buildnumber-plugin, because jna is required and currently broken in f17

gil gil at fedoraproject.org
Sat Jul 14 07:51:45 UTC 2012


commit 5c1b56be18747df38a546e8da3906ed3ba47a869
Author: gil <puntogil at libero.it>
Date:   Sat Jul 14 09:51:17 2012 +0200

    Don't use buildnumber-plugin, because jna is required and currently broken in f17

 bval-0.4-remove-buildnumber-maven-plugin.patch |   34 ++++++++++++++++++++++++
 bval.spec                                      |    3 ++
 2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/bval-0.4-remove-buildnumber-maven-plugin.patch b/bval-0.4-remove-buildnumber-maven-plugin.patch
new file mode 100644
index 0000000..4554202
--- /dev/null
+++ b/bval-0.4-remove-buildnumber-maven-plugin.patch
@@ -0,0 +1,34 @@
+--- pom.xml	2012-07-12 15:28:39.355767744 +0200
++++ pom.xml-gil	2012-07-14 09:40:05.130197200 +0200
+@@ -524,11 +524,11 @@
+                     <artifactId>findbugs-maven-plugin</artifactId>
+                     <version>2.3.2</version>
+                 </plugin-->
+-                <plugin>
++                <!--plugin>
+                     <groupId>org.codehaus.mojo</groupId>
+                     <artifactId>buildnumber-maven-plugin</artifactId>
+                     <version>1.0-beta-4</version>
+-                </plugin>
++                </plugin-->
+                 <plugin>
+                   <groupId>org.apache.maven.plugins</groupId>
+                   <artifactId>maven-source-plugin</artifactId>
+@@ -573,7 +573,7 @@
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>ianal-maven-plugin</artifactId>
+             </plugin-->
+-            <plugin>
++            <!--plugin>
+                 <groupId>org.codehaus.mojo</groupId>
+                 <artifactId>buildnumber-maven-plugin</artifactId>
+                 <configuration>
+@@ -588,7 +588,7 @@
+                         </goals>
+                     </execution>
+                 </executions>
+-            </plugin>
++            </plugin-->
+             <plugin>
+               <groupId>org.apache.maven.plugins</groupId>
+               <artifactId>maven-source-plugin</artifactId>
diff --git a/bval.spec b/bval.spec
index bd040de..f1c09a3 100644
--- a/bval.spec
+++ b/bval.spec
@@ -33,6 +33,8 @@ Patch5:        %{name}-%{namedversion}-disable-guice.patch
 Patch6:        %{name}-%{namedversion}-extras-pom.patch
 # fix koji build problems missing org.apache.geronimo.osgi.locator.ProviderLocator
 Patch7:        %{name}-%{namedversion}-jsr303-osgi-locator.patch
+# Don't use buildnumber-plugin, because jna is required and currently broken in f17
+Patch8:        %{name}-%{namedversion}-remove-buildnumber-maven-plugin.patch
 
 BuildRequires: java-devel >= 0:1.7.0
 BuildRequires: jpackage-utils
@@ -121,6 +123,7 @@ find . -name "*.jar" -delete
 %endif
 %patch6 -p0
 %patch7 -p0
+%patch8 -p0
 
 # unavailable deps
 # org.hibernate.jsr303.tck jsr303-tck 1.0.6.GA


More information about the scm-commits mailing list