[truezip] Update to upstream 7.6.6

[Gerard Ryan]

commit 49e840c57b23231d5a083f968f5acf109d303c83
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Oct 13 01:25:54 2012 +0100

    Update to upstream 7.6.6
    
    - Remove patch and add pom macros instead.
    - add new PaceManager extension as a subpackage.
    - Switch parent in POM to older parent from 7.5.5.

 .gitignore   |    1 +
 sources      |    2 +-
 truezip.spec |   55 ++++++++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 46 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fc13f01..c13b5b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /truezip-7.5.5.tar.gz
+/truezip-7.6.6.tar.gz
diff --git a/sources b/sources
index e7d3d67..d20024d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7fae6573b27711edb49d2389d96de165  truezip-7.5.5.tar.gz
+9ace79c9f9fd5466f851416200494f5d  truezip-7.6.6.tar.gz
diff --git a/truezip.spec b/truezip.spec
index 762b440..2e200e1 100644
--- a/truezip.spec
+++ b/truezip.spec
@@ -1,6 +1,6 @@
 Name:		truezip
-Version:	7.5.5
-Release:	6%{?dist}
+Version:	7.6.6
+Release:	1%{?dist}
 Summary:	Java based VFS for treating archive files as virtual directories
 
 Group:		Development/Libraries
@@ -12,10 +12,6 @@ URL:		http://truezip.java.net/
 Source0:	%{name}-%{version}.tar.gz
 Source1:	http://www.eclipse.org/legal/epl-v10.html
 
-# Set maven.compiler source and target to 1.7
-# Fix groupId for findbugs
-# Add jsr-305 as dependency
-Patch0:		%{name}-pom.patch
 
 BuildArch:	noarch
 
@@ -57,6 +53,7 @@ Requires:	%{name}-driver-tzp = %{version}-%{release}
 Requires:	%{name}-driver-zip = %{version}-%{release}
 Requires:	%{name}-extension-parent = %{version}-%{release}
 Requires:	%{name}-extension-jmx-jul = %{version}-%{release}
+Requires:	%{name}-extension-pace = %{version}-%{release}
 Requires:	%{name}-file = %{version}-%{release}
 Requires:	%{name}-kernel = %{version}-%{release}
 Requires:	%{name}-path = %{version}-%{release}
@@ -188,6 +185,20 @@ Add the JAR artifact of this module to the run time class path to
 make its file system manager and I/O pool service available for
 service location in the client API modules.
 
+%package extension-pace
+Summary:	TrueZip PaceManager Extension
+Requires:	java
+Requires:	jpackage-utils
+Requires:	%{name}-extension-parent = %{version}-%{release}
+Requires:	%{name}-driver-file = %{version}-%{release}
+
+%description extension-pace
+This module constrains the number of mounted archive files in order to
+save some heap space. It provides a JMX interface for monitoring and
+management. Add the JAR artifact of this module to the run time class
+path to make its services available for service location in the client
+API modules.
+
 %package file
 Summary:	TrueZip File*
 Requires:	java
@@ -280,7 +291,16 @@ find -type f -name *.zip -delete
 find -type f -name *.jar -delete
 find -type f -name *.class -delete
 
-%patch0
+# Parent has changed to net.java.truecommons:truecommons-parent
+# which isn't in Fedora, but older parent is
+%pom_set_parent de.schlichtherle:oss-parent:9
+
+# Fix findbugs groupId (switch for new dep)
+%pom_remove_dep com.google.code.findbugs:annotations
+%pom_add_dep net.sourceforge.findbugs:annotations . "<optional>true</optional>"
+
+# Add jsr-305 as dependency for javax.annotation.concurrent
+%pom_add_dep org.jsr-305:ri
 
 
 %build
@@ -313,14 +333,16 @@ for sub in file http tar tzp zip; do
     %add_maven_depmap JPP.%{name}-%{name}-driver-${sub}.pom %{name}/%{name}-driver-${sub}.jar -f driver-${sub}
 done
 
-# truezip-extension-jmx-jul is exceptional
+# truezip-extensions are exceptional
 install -pm 644 %{name}-extension/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-extension.pom
 %add_maven_depmap JPP.%{name}-%{name}-extension.pom -f extension
 
-cp -p %{name}-extension/%{name}-extension-jmx-jul/target/%{name}-extension-jmx-jul-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-extension-jmx-jul.jar
+for ext in extension-jmx-jul extension-pace; do
+    cp -p %{name}-extension/%{name}-${ext}/target/%{name}-${ext}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${ext}.jar
 
-install -pm 644 %{name}-extension/%{name}-extension-jmx-jul/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-extension-jmx-jul.pom
-%add_maven_depmap JPP.%{name}-%{name}-extension-jmx-jul.pom %{name}/%{name}-extension-jmx-jul.jar -f extension-jmx-jul
+    install -pm 644 %{name}-extension/%{name}-${ext}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${ext}.pom
+    %add_maven_depmap JPP.%{name}-%{name}-${ext}.pom %{name}/%{name}-${ext}.jar -f ${ext}
+done
 
 
 #JAVADOCS
@@ -377,6 +399,11 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
 %{_mavenpomdir}/JPP.%{name}-%{name}-extension-jmx-jul.pom
 %{_mavendepmapfragdir}/%{name}-extension-jmx-jul
 
+%files extension-pace
+%{_javadir}/%{name}/%{name}-extension-pace.jar
+%{_mavenpomdir}/JPP.%{name}-%{name}-extension-pace.pom
+%{_mavendepmapfragdir}/%{name}-extension-pace
+
 %files file
 %{_javadir}/%{name}/%{name}-file.jar
 %{_mavenpomdir}/JPP.%{name}-%{name}-file.pom
@@ -404,6 +431,12 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
 
 
 %changelog
+* Sat Oct 13  2012 Gerard Ryan <galileo at fedoraproject.org> - 7.6.6-1
+- Update to upstream 7.6.6.
+- Remove patch and add pom macros instead.
+- add new PaceManager extension as a subpackage.
+- Switch parent in POM to older parent from 7.5.5.
+
 * Tue Jul 24 2012 Gerard Ryan <galileo at fedoraproject.org> - 7.5.5-6
 - Add schlichtherle-oss-parent as a requires for truezip-parent