[rpms/hawtjni] epel10: Upstream release 1.2.

[rpms/hawtjni] epel10: Upstream release 1.2.

[Marek Goldmann]

A new commit has been pushed.

Repo   : rpms/hawtjni
Branch : epel10
Commit : 4bc95ef64c1e3c4408fc8773f9cdfd8e3b5f82cc
Author : Marek Goldmann <goldmann@fedoraproject.org>
Date   : 2011-07-29T04:34:41-04:00
Stats  : +48/-52 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/hawtjni/c/4bc95ef64c1e3c4408fc8773f9cdfd8e3b5f82cc?branch=epel10

Log:
Upstream release 1.2.

---
diff --git a/.gitignore b/.gitignore
index fb7e3bb..32651bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /hawtjni-1.1.tar.xz
+/hawtjni-1.2.tar.xz

diff --git a/hawtjni-1.1-pom.patch b/hawtjni-1.1-pom.patch
deleted file mode 100644
index 24b1ded..0000000
--- a/hawtjni-1.1-pom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur hawtjni-1.1/pom.xml hawtjni-1.1-work/pom.xml
---- hawtjni-1.1/pom.xml	2010-11-04 09:17:44.000000000 -0400
-+++ hawtjni-1.1-work/pom.xml	2011-05-28 08:39:48.981676048 -0400
-@@ -200,7 +200,7 @@
-     <module>hawtjni-runtime</module>
-     <module>hawtjni-generator</module>
-     <module>maven-hawtjni-plugin</module>
--    <module>hawtjni-example</module>
-+<!--    <module>hawtjni-example</module>-->
-   </modules>
- 
- </project>

diff --git a/hawtjni-1.1-remove-shade-plugin.patch b/hawtjni-1.1-remove-shade-plugin.patch
deleted file mode 100644
index 4c9b47f..0000000
--- a/hawtjni-1.1-remove-shade-plugin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur hawtjni-1.1/hawtjni-generator/pom.xml hawtjni-1.1-work/hawtjni-generator/pom.xml
---- hawtjni-1.1/hawtjni-generator/pom.xml	2010-11-04 09:17:44.000000000 -0400
-+++ hawtjni-1.1-work/hawtjni-generator/pom.xml	2011-05-30 06:45:53.024344971 -0400
-@@ -72,7 +72,7 @@
-     <plugins>
-       
-       <!-- include all the dependencies into the jar so it can run standalone -->
--      <plugin>
-+<!--      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-shade-plugin</artifactId>
-         <version>1.3</version>
-@@ -91,7 +91,7 @@
-             </configuration>
-           </execution>
-         </executions>
--      </plugin>
-+      </plugin>-->
-       
-     </plugins>
-   </build>

diff --git a/hawtjni-1.2-pom.patch b/hawtjni-1.2-pom.patch
new file mode 100644
index 0000000..6d8d50d
--- /dev/null
+++ b/hawtjni-1.2-pom.patch
@@ -0,0 +1,35 @@
+diff -Naur hawtjni-1.2/hawtjni-generator/pom.xml hawtjni-1.2-work/hawtjni-generator/pom.xml
+--- hawtjni-1.2/hawtjni-generator/pom.xml	2011-06-18 19:29:07.000000000 -0400
++++ hawtjni-1.2-work/hawtjni-generator/pom.xml	2011-07-29 04:23:51.491319533 -0400
+@@ -72,7 +72,7 @@
+     <plugins>
+       
+       <!-- include all the dependencies into the jar so it can run standalone -->
+-      <plugin>
++<!--      <plugin>
+         <groupId>org.apache.maven.plugins</groupId>
+         <artifactId>maven-shade-plugin</artifactId>
+         <version>1.3</version>
+@@ -91,7 +91,7 @@
+             </configuration>
+           </execution>
+         </executions>
+-      </plugin>
++      </plugin>-->
+       
+     </plugins>
+   </build>
+diff -Naur hawtjni-1.2/pom.xml hawtjni-1.2-work/pom.xml
+--- hawtjni-1.2/pom.xml	2011-06-18 19:29:07.000000000 -0400
++++ hawtjni-1.2-work/pom.xml	2011-07-29 04:22:48.710324322 -0400
+@@ -212,8 +212,8 @@
+     <module>hawtjni-runtime</module>
+     <module>hawtjni-generator</module>
+     <module>maven-hawtjni-plugin</module>
+-    <module>hawtjni-example</module>
+-    <module>hawtjni-website</module>
++<!--    <module>hawtjni-example</module>
++    <module>hawtjni-website</module>-->
+   </modules>
+ 
+ </project>

diff --git a/hawtjni.spec b/hawtjni.spec
index a0799ed..aba7156 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,17 +1,15 @@
 Name:             hawtjni
-Version:          1.1
-Release:          4%{?dist}
+Version:          1.2
+Release:          1%{?dist}
 Summary:          Code generator that produces the JNI code
 Group:            Development/Libraries
 License:          ASL 2.0 and EPL and BSD
 URL:              http://hawtjni.fusesource.org/
 
 # git clone git://github.com/fusesource/hawtjni.git
-# cd hawtjni && git checkout hawtjni-1.1
-# git archive --format=tar --prefix=hawtjni-1.1/ hawtjni-1.1 | xz > hawtjni-1.1.tar.xz
+# cd hawtjni && git archive --format=tar --prefix=hawtjni-1.2/ hawtjni-project-1.2 | xz > hawtjni-1.2.tar.xz
 Source0:          %{name}-%{version}.tar.xz
 Patch0:           %{name}-%{version}-pom.patch
-Patch1:           %{name}-%{version}-remove-shade-plugin.patch
 
 BuildArch:        noarch
 
@@ -35,8 +33,6 @@ BuildRequires:    xbean >= 3.7-7
 
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 Requires:         xbean >= 3.7-7
 Requires:         apache-commons-cli
 Requires:         asm2
@@ -72,7 +68,6 @@ This package allows to use HawtJNI from a maven plugin.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 mvn-rpmbuild install javadoc:aggregate
@@ -96,16 +91,10 @@ install -pm 644 %{name}-runtime/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{nam
 install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
 
 # DEPMAP
-%add_to_maven_depmap org.fusesource.hawtjni hawtjni-pom %{version} JPP %{name}-pom
-%add_to_maven_depmap org.fusesource.hawtjni hawtjni-generator %{version} JPP %{name}-generator
-%add_to_maven_depmap org.fusesource.hawtjni hawtjni-runtime %{version} JPP %{name}-runtime
-%add_to_maven_depmap org.fusesource.hawtjni maven-hawtjni-plugin %{version} JPP maven-hawtjni-plugin
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}-pom.pom
+%add_maven_depmap JPP-%{name}-generator.pom %{name}-generator.jar
+%add_maven_depmap JPP-%{name}-runtime.pom %{name}-runtime.jar
+%add_maven_depmap JPP-maven-%{name}-plugin.pom maven-%{name}-plugin.jar
 
 %files
 %{_mavenpomdir}/*
@@ -124,6 +113,10 @@ install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-
 %{_javadir}/maven-%{name}-plugin.jar
 
 %changelog
+* Fri Jul 29 2011 Marek Goldmann <mgoldman@redhat.com> 1.2-1
+- Upstream release 1.2
+- Moved to new depmap macro
+
 * Mon May 30 2011 Marek Goldmann <mgoldman@redhat.com> 1.1-4
 - Removed maven-shade-plugin dependency
 

diff --git a/sources b/sources
index 75d0e7f..0ba8794 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc1a98b5cf60e90fb79a33fc003c2af9  hawtjni-1.1.tar.xz
+b19844ea9a51520e8c625c5c4674fa37  hawtjni-1.2.tar.xz