[maven2] Fix jpp script to limit maven2.jpp.mode scope
by Stanislav Ochotnicky
commit 5f999d4c3e7a50951e8d90b72139d6917a477329
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Apr 18 14:22:33 2011 +0200
Fix jpp script to limit maven2.jpp.mode scope
maven2-jpp-script | 5 ++++-
maven2.spec | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/maven2-jpp-script b/maven2-jpp-script
index 1be34bf..c19fe5d 100644
--- a/maven2-jpp-script
+++ b/maven2-jpp-script
@@ -7,4 +7,7 @@ fi
export M2_HOME=/usr/share/maven2
echo $JAVA_HOME
-export JAVA_HOME; $M2_HOME/bin/mvn -Dmaven2.jpp.mode "$@"
+# can't put it on command line due to
+# http://jira.codehaus.org/browse/SUREFIRE-121
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven2.jpp.mode"
+export JAVA_HOME; $M2_HOME/bin/mvn "$@"
diff --git a/maven2.spec b/maven2.spec
index 7194705..03f03b7 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
Name: maven2
Version: 2.2.1
-Release: 21%{?dist}
+Release: 22%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Build Tools
@@ -519,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
%doc
%changelog
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.1-22
+- Fix jpp script to limit maven2.jpp.mode scope
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.1-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years
[maven] Enable MAVEN_OPTS override in scripts
by Stanislav Ochotnicky
commit abf9b4a49aa43735c45bf1d68033f6614bc19ec5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Mon Apr 18 10:20:16 2011 +0200
Enable MAVEN_OPTS override in scripts
maven-script-local | 2 +-
maven-script-rpmbuild | 2 +-
maven.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/maven-script-local b/maven-script-local
index a5ebc59..61499df 100644
--- a/maven-script-local
+++ b/maven-script-local
@@ -10,7 +10,7 @@ echo $JAVA_HOME
export JAVA_HOME
# can't put it on command line due to
# http://jira.codehaus.org/browse/SUREFIRE-121
-export MAVEN_OPTS="-Dmaven.local.mode ${local_add}"
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add}"
echo "Running mvn in local mode. Please report bugs to http://bugzilla.redhat.com"
$M2_HOME/bin/mvn "$@"
diff --git a/maven-script-rpmbuild b/maven-script-rpmbuild
index 3f3c1ae..f9058ad 100644
--- a/maven-script-rpmbuild
+++ b/maven-script-rpmbuild
@@ -42,6 +42,6 @@ echo $JAVA_HOME
export JAVA_HOME
# can't put it on command line due to
# http://jira.codehaus.org/browse/SUREFIRE-121
-export MAVEN_OPTS="-Dmaven.local.mode ${local_add}"
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add}"
$M2_HOME/bin/mvn -o "$@"
diff --git a/maven.spec b/maven.spec
index 515150d..20847c8 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
Name: maven
Version: 3.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -308,6 +308,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%changelog
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-2
+- Enable MAVEN_OPTS override in scripts
+
* Fri Mar 4 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.0.3-1
- Update to 3.0.3
- Add ext subdirectory to lib
13 years
[apache-commons-compress] Updated to 1.1 Adapted to current java packaging guidelines
by spike
commit 3e5dd0569eadc2ddb391afb1701f25b9fcd6770b
Author: spike <spike(a)fedoraproject.org>
Date: Sat Apr 16 09:54:39 2011 +0200
Updated to 1.1
Adapted to current java packaging guidelines
.gitignore | 1 +
apache-commons-compress.spec | 100 ++++++++++++++---------------------------
sources | 2 +-
3 files changed, 36 insertions(+), 67 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6dcf86..b6c1ccf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-compress-1.0-src.tar.gz
+/commons-compress-1.1-src.tar.gz
diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec
index 72753d3..47885a1 100644
--- a/apache-commons-compress.spec
+++ b/apache-commons-compress.spec
@@ -1,32 +1,19 @@
-%global shortname commons-compress
+%global base_name compress
+%global short_name commons-%{base_name}
-Name: apache-%{shortname}
-Version: 1.0
-Release: 9%{?dist}
+Name: apache-%{short_name}
+Version: 1.1
+Release: 1%{?dist}
Summary: Java API for working with tar, zip and bzip2 files
Group: Development/Libraries
License: ASL 2.0
-URL: http://commons.apache.org/compress/
-Source0: http://www.apache.org/dist/commons/compress/source/%{shortname}-%{version...
+URL: http://commons.apache.org/%{base_name}/
+Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{ve...
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils
-BuildRequires: maven2
-BuildRequires: maven2-plugin-antrun
-BuildRequires: maven2-plugin-assembly
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-idea
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-source
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-plugin-bundle
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit
+BuildRequires: apache-commons-parent
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires(post): jpackage-utils
@@ -34,8 +21,8 @@ Requires(postun): jpackage-utils
# Upstream name change
-Provides: jakarta-%{shortname} = %{version}-%{release}
-Obsoletes: jakarta-%{shortname} < 1.0-2
+Provides: jakarta-%{short_name} = %{version}-%{release}
+Obsoletes: jakarta-%{short_name} < 1.0-2
%description
The code in this component came from Avalon's Excalibur, but originally
@@ -48,77 +35,59 @@ Ant -> Avalon-Excalibur -> Commons-IO -> Commons-Compress.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
-Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
# Upstream name change
-Provides: jakarta-%{shortname}-javadoc = %{version}-%{release}
-Obsoletes: jakarta-%{shortname}-javadoc < 1.0-2
+Provides: jakarta-%{short_name}-javadoc = %{version}-%{release}
+Obsoletes: jakarta-%{short_name}-javadoc < 1.0-2
%description javadoc
-Development documentation for %{name}.
-
+This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{shortname}-%{version}-src
-
+%setup -q -n %{short_name}-%{version}-src
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
-
+mvn-rpmbuild install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
+# jars
+install -d -m 0755 %{buildroot}%{_javadir}
+install -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-# jar
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 target/%{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}-%{version}.jar
-ln -s %{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{shortname}.jar
-ln -s %{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{shortname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+# poms
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# pomfile
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{shortname}.pom
-%add_to_maven_depmap org.apache.commons %{shortname} %{version} JPP %{shortname}
-
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%post
%update_maven_depmap
-
%postun
%update_maven_depmap
-
%files
%defattr(-,root,root,-)
%doc LICENSE.txt NOTICE.txt
-%{_javadir}/%{shortname}.jar
-%{_javadir}/%{shortname}-%{version}.jar
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{shortname}.pom
-
+%{_javadir}/*
+%{_mavenpomdir}/JPP-%{short_name}.pom
+%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
-
+%doc LICENSE.txt NOTICE.txt
+%doc %{_javadocdir}/%{name}
%changelog
+* Sat Apr 16 2011 Chris Spike <spike(a)fedoraproject.org> 1.1-1
+- Updated to 1.1
+- Adapted to current java packaging guidelines
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -143,4 +112,3 @@ rm -rf $RPM_BUILD_ROOT
* Tue May 04 2010 Sandro Mathys <red at fedoraproject.org> - 1.0-2
- Renamed from jakarta-commons-compress
-
diff --git a/sources b/sources
index 74616e3..5b749e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e5ef0d79590e06049724f159408923f commons-compress-1.0-src.tar.gz
+735815362c7a459108e0e162ba9f3842 commons-compress-1.1-src.tar.gz
13 years