[truezip] Use new maven macros and guidelines
Gerard Ryan
galileo at fedoraproject.org
Sat Apr 6 20:09:18 UTC 2013
commit 3c68577b85c5315e4dbff3a7bf92b4c938210254
Author: Gerard Ryan <gerard at ryan.lt>
Date: Sat Apr 6 21:08:40 2013 +0100
Use new maven macros and guidelines
truezip.spec | 210 +++++++---------------------------------------------------
1 files changed, 25 insertions(+), 185 deletions(-)
---
diff --git a/truezip.spec b/truezip.spec
index 66c9aca..5e7be27 100644
--- a/truezip.spec
+++ b/truezip.spec
@@ -1,6 +1,6 @@
Name: truezip
Version: 7.6.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java based VFS for treating archive files as virtual directories
Group: Development/Libraries
@@ -15,8 +15,6 @@ Source1: http://www.eclipse.org/legal/epl-v10.html
BuildArch: noarch
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
BuildRequires: apache-commons-compress
BuildRequires: bouncycastle
BuildRequires: findbugs
@@ -43,8 +41,6 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-plugin
-Requires: java
-Requires: jpackage-utils
Requires: %{name}-driver-parent = %{version}-%{release}
Requires: %{name}-driver-file = %{version}-%{release}
Requires: %{name}-driver-http = %{version}-%{release}
@@ -76,7 +72,6 @@ system space.
%package parent
Summary: Parent POM for TrueZip modules
-Requires: jpackage-utils
Requires: schlichtherle-oss-parent
%description parent
@@ -84,18 +79,12 @@ Parent POM for TrueZip modules.
%package driver-parent
Summary: Parent POM for TrueZip pluggable file system drivers
-Requires: jpackage-utils
-Requires: %{name}-parent = %{version}-%{release}
%description driver-parent
Parent POM for TrueZip pluggable file system drivers.
%package driver-file
Summary: TrueZip driver for the FILE scheme
-Requires: java
-Requires: jpackage-utils
-Requires: %{name}-driver-parent = %{version}-%{release}
-Requires: %{name}-kernel = %{version}-%{release}
%description driver-file
The file system driver family for the FILE scheme.
@@ -106,12 +95,6 @@ client API modules.
%package driver-http
Summary: TrueZip driver for the HTTP(S) scheme
-Requires: java
-Requires: jpackage-utils
-Requires: httpcomponents-client
-Requires: httpcomponents-core
-Requires: %{name}-driver-parent = %{version}-%{release}
-Requires: %{name}-kernel = %{version}-%{release}
%description driver-http
The file system driver for the HTTP(S) scheme.
@@ -122,10 +105,6 @@ client API modules.
%package driver-tar
Summary: TrueZip driver for TAR archives
-Requires: java
-Requires: jpackage-utils
-Requires: apache-commons-compress
-Requires: %{name}-path = %{version}-%{release}
%description driver-tar
The file system driver family for TAR and related archive file types.
@@ -136,11 +115,6 @@ client API modules.
%package driver-tzp
Summary: TrueZip driver for ZIP.RAES (TZP) encrypted archives
-Requires: java
-Requires: jpackage-utils
-Requires: bouncycastle
-Requires: %{name}-driver-zip = %{version}-%{release}
-Requires: %{name}-file = %{version}-%{release}
%description driver-tzp
The file system driver family for RAES encrypted ZIP alias
@@ -152,30 +126,18 @@ client API modules.
%package driver-zip
Summary: TrueZip driver for ZIP archives
-Requires: java
-Requires: jpackage-utils
-Requires: apache-commons-compress
-Requires: bouncycastle
-Requires: %{name}-path = %{version}-%{release}
-Requires: %{name}-swing = %{version}-%{release}
%description driver-zip
TrueZIP Path module application - requires JSE 7.
%package extension-parent
Summary: Parent POM for TrueZip pluggable extensions
-Requires: jpackage-utils
-Requires: %{name}-parent = %{version}-%{release}
%description extension-parent
Parent POM for TrueZip pluggable extensions.
%package extension-jmx-jul
Summary: TrueZip JMX/JUL Extension
-Requires: java
-Requires: jpackage-utils
-Requires: %{name}-extension-parent = %{version}-%{release}
-Requires: %{name}-driver-file = %{version}-%{release}
%description extension-jmx-jul
This module provides a file system manager and an I/O pool service
@@ -187,10 +149,6 @@ 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
@@ -201,10 +159,6 @@ API modules.
%package file
Summary: TrueZip File*
-Requires: java
-Requires: jpackage-utils
-Requires: jemmy
-Requires: %{name}-driver-file = %{version}-%{release}
%description file
This module provides the TFile* classes for simple, uniform,
@@ -216,9 +170,6 @@ trees and choosing entries in archive files.
%package kernel
Summary: Implements and manages virtual file systems for %{name}
-Requires: java
-Requires: jpackage-utils
-Requires: %{name}-parent = %{version}-%{release}
%description kernel
@@ -232,10 +183,6 @@ the file system drivers do not need to take care of this.
%package path
Summary: TrueZip Path
-Requires: java
-Requires: jpackage-utils
-Requires: %{name}-file = %{version}-%{release}
-Requires: %{name}-parent = %{version}-%{release}
%description path
This module provides the TPath class for simple, uniform,
@@ -246,10 +193,6 @@ system provider for the NIO.2 API (JSR 203) in JSE 7.
%package samples
Summary: TrueZip Samples
-Requires: java
-Requires: jpackage-utils
-Requires: %{name}-driver-tzp = %{version}-%{release}
-Requires: %{name}-extension-jmx-jul = %{version}-%{release}
%description samples
Sample applications to demonstrate the usage of various TrueZIP module
@@ -266,10 +209,6 @@ de.schlichtherle.truezip.fs.sl.FsDriverLocator for more information.
%package swing
Summary: TrueZip general Swing GUI classes
-Requires: java
-Requires: jpackage-utils
-Requires: jemmy
-Requires: %{name}-parent = %{version}-%{release}
%description swing
General Swing GUI classes.
@@ -279,7 +218,6 @@ This module does not depend on other TrueZIP modules.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
@@ -302,135 +240,37 @@ find -type f -name *.class -delete
# Add jsr-305 as dependency for javax.annotation.concurrent
%pom_add_dep org.jsr-305:ri
+%pom_disable_module %{name}-archetype
+
%build
# Skipping tests because some fail with 'Bad test setup' error
-mvn-rpmbuild package javadoc:aggregate -Dmaven.test.skip=true
+%mvn_build -s --skip-tests
%install
-
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-
-# These modules all have same structure, so we loop through to install
-for module in file kernel path samples swing; do
- install -m 644 %{name}-${module}/target/%{name}-${module}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${module}.jar
-
- install -pm 644 %{name}-${module}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-${module}.pom
-
- %add_maven_depmap JPP.%{name}-%{name}-${module}.pom %{name}/%{name}-${module}.jar -f ${module}
-
-done
-
-# truezip-driver has submodules
-install -pm 644 %{name}-driver/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-driver.pom
-%add_maven_depmap JPP.%{name}-%{name}-driver.pom -f driver
-
-for sub in file http tar tzp zip; do
- cp -p %{name}-driver/%{name}-driver-${sub}/target/%{name}-driver-${sub}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-driver-${sub}.jar
-
- install -pm 644 %{name}-driver/%{name}-driver-${sub}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-driver-${sub}.pom
- %add_maven_depmap JPP.%{name}-%{name}-driver-${sub}.pom %{name}/%{name}-driver-${sub}.jar -f driver-${sub}
-done
-
-# 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
-
-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}-${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
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-# main POM
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-
-
-%files parent
-%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%{_javadocdir}/%{name}
-
-%files driver-parent
-%{_mavenpomdir}/JPP.%{name}-%{name}-driver.pom
-%{_mavendepmapfragdir}/%{name}-driver
-
-%files driver-file
-%{_javadir}/%{name}/%{name}-driver-file.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-driver-file.pom
-%{_mavendepmapfragdir}/%{name}-driver-file
-
-%files driver-http
-%{_javadir}/%{name}/%{name}-driver-http.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-driver-http.pom
-%{_mavendepmapfragdir}/%{name}-driver-http
-
-%files driver-tar
-%{_javadir}/%{name}/%{name}-driver-tar.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-driver-tar.pom
-%{_mavendepmapfragdir}/%{name}-driver-tar
-
-%files driver-tzp
-%{_javadir}/%{name}/%{name}-driver-tzp.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-driver-tzp.pom
-%{_mavendepmapfragdir}/%{name}-driver-tzp
-
-%files driver-zip
-%{_javadir}/%{name}/%{name}-driver-zip.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-driver-zip.pom
-%{_mavendepmapfragdir}/%{name}-driver-zip
-
-%files extension-parent
-%{_mavenpomdir}/JPP.%{name}-%{name}-extension.pom
-%{_mavendepmapfragdir}/%{name}-extension
-
-%files extension-jmx-jul
-%{_javadir}/%{name}/%{name}-extension-jmx-jul.jar
-%{_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
-%{_mavendepmapfragdir}/%{name}-file
-
-%files kernel
-%{_javadir}/%{name}/%{name}-kernel.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-kernel.pom
-%{_mavendepmapfragdir}/%{name}-kernel
-
-%files path
-%{_javadir}/%{name}/%{name}-path.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-path.pom
-%{_mavendepmapfragdir}/%{name}-path
-
-%files samples
-%{_javadir}/%{name}/%{name}-samples.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-samples.pom
-%{_mavendepmapfragdir}/%{name}-samples
-
-%files swing
-%{_javadir}/%{name}/%{name}-swing.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-swing.pom
-%{_mavendepmapfragdir}/%{name}-swing
-
+%mvn_install
+
+%files parent -f .mfiles-%{name}
+%files javadoc -f .mfiles-javadoc
+%files driver-parent -f .mfiles-%{name}-driver
+%files driver-file -f .mfiles-%{name}-driver-file
+%files driver-http -f .mfiles-%{name}-driver-http
+%files driver-tar -f .mfiles-%{name}-driver-tar
+%files driver-tzp -f .mfiles-%{name}-driver-tzp
+%files driver-zip -f .mfiles-%{name}-driver-zip
+%files extension-parent -f .mfiles-%{name}-extension
+%files extension-jmx-jul -f .mfiles-%{name}-extension-jmx-jul
+%files extension-pace -f .mfiles-%{name}-extension-pace
+%files file -f .mfiles-%{name}-file
+%files kernel -f .mfiles-%{name}-kernel
+%files path -f .mfiles-%{name}-path
+%files samples -f .mfiles-%{name}-samples
+%files swing -f .mfiles-%{name}-swing
%changelog
+* Sat Apr 16 2013 Gerard Ryan <galileo at fedoraproject.org> - 7.6.6-4
+- Use new maven macros.
+
* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.6.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list