[sat4j] Make 1.5-level bytecode
by Andrew Overholt
commit c17c1ebbbe8c60143590d77ecec868507ca8ef60
Author: Andrew Overholt <overholt(a)redhat.com>
Date: Mon Aug 29 10:07:43 2011 -0400
Make 1.5-level bytecode
This enables bootstrapping of Eclipse with OpenJDK 7.
sat4j.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/sat4j.spec b/sat4j.spec
index fb90ca5..81ad018 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -4,7 +4,7 @@
Name: sat4j
Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
@@ -38,7 +38,7 @@ without worrying about the details.
rm lib/commons-cli.jar
%build
-ant -Dbuild.compiler=modern -Drelease=%{version} -DBUILD_DATE=%{qualifier} p2
+ant -Dbuild.compiler=modern -Drelease=%{version} -DBUILD_DATE=%{qualifier} -Dtarget=1.5 p2
%install
rm -rf $RPM_BUILD_ROOT
@@ -57,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/org.sat4j*
%changelog
+* Thu Aug 25 2011 Andrew Overholt <overholt(a)redhat.com> 2.3.0-2
+- Make 1.5-level bytecode. This enables bootstrapping of Eclipse
+ with OpenJDK 7.
+
* Mon Apr 04 2011 Chris Aniszczyk <zx(a)redhat.com> 2.3.0-1
- Update to 2.3.0.
12 years, 7 months
[maven-resources-plugin] Update to 2.5 + Guideline fixes
by tradej@fedoraproject.org
commit a449acca824c361219111f060917c881ebd5d181
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Aug 22 09:53:04 2011 +0200
Update to 2.5 + Guideline fixes
.gitignore | 1 +
maven-resources-plugin.spec | 26 ++++++++++++--------------
sources | 2 +-
3 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8b42e26..f4c0ded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
maven-resources-plugin-2.2.tar.gz
/maven-resources-plugin-2.4.3.tar.gz
+/maven-resources-plugin-2.5.tar.gz
diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec
index 94cf8fc..22a0092 100644
--- a/maven-resources-plugin.spec
+++ b/maven-resources-plugin.spec
@@ -1,13 +1,13 @@
Name: maven-resources-plugin
-Version: 2.4.3
-Release: 4%{?dist}
+Version: 2.5
+Release: 1%{?dist}
Summary: Maven Resources Plugin
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-resources-plugin
-#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin... maven-resources-plugin-2.4.3
-#tar zcf maven-resources-plugin-2.4.3.tar.gz maven-resources-plugin-2.4.3/
+#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-resources-plugin... maven-resources-plugin-2.5
+#tar zcf maven-resources-plugin-2.5.tar.gz maven-resources-plugin-2.5/
Source0: %{name}-%{version}.tar.gz
BuildArch: noarch
@@ -30,6 +30,7 @@ BuildRequires: plexus-interpolation
BuildRequires: plexus-digest
BuildRequires: maven-project
BuildRequires: maven-monitor
+BuildRequires: maven-filtering
Requires: plexus-build-api
Requires: plexus-containers-container-default
@@ -42,8 +43,6 @@ Requires: maven-project
Requires: maven-monitor
Requires: jpackage-utils
Requires: java
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Provides: maven2-plugin-resources = %{version}-%{release}
Obsoletes: maven2-plugin-resources <= 0:2.0.8
@@ -67,29 +66,23 @@ API documentation for %{name}.
%build
mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
# jars
install -d -m 0755 %{buildroot}%{_javadir}
install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-%add_to_maven_depmap org.apache.maven.plugins maven-resources-plugin %{version} JPP maven-resources-plugin
-
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
# javadoc
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
%files
%{_javadir}/*
@@ -100,6 +93,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Mon Aug 29 2011 Tomas Radej <tradej(a)redhat.com> - 2.5-1
+- Update to 2.5
+- Guideline fixes
+- Added maven-filtering dep
+
* Thu Jun 23 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.4.3-4
- Add several packages to BR/R as stated in pom.xml
diff --git a/sources b/sources
index 2d382cc..5417ea9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0ab5e32bd8b70a0e3e55ce472f68e55 maven-resources-plugin-2.4.3.tar.gz
+a1ed763c6c5e4776a5a33a35f7875cd1 maven-resources-plugin-2.5.tar.gz
12 years, 7 months
[plexus-container-default] Fix add_maven_depamp macro call with correct path
by Stanislav Ochotnicky
commit e898d15b2e45c8f87fe96e36b0c44afd133e0f41
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri Aug 26 15:10:17 2011 +0200
Fix add_maven_depamp macro call with correct path
plexus-container-default.spec | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/plexus-container-default.spec b/plexus-container-default.spec
index 82d2ff0..789a748 100644
--- a/plexus-container-default.spec
+++ b/plexus-container-default.spec
@@ -28,9 +28,12 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+%global parent plexus
+%global subname container-default
+
Name: plexus-container-default
Version: 1.0
-Release: 0.5.a9%{?dist}
+Release: 0.6.a9%{?dist}
Epoch: 0
Summary: Default Plexus Container
License: ASL 2.0 and MIT
@@ -80,14 +83,14 @@ mvn-rpmbuild install javadoc:aggregate
%install
# jars
-install -d -m 755 %{buildroot}%{_javadir}/plexus
+install -d -m 755 %{buildroot}%{_javadir}/%{parent}
install -pm 644 target/%{name}-%{version}-alpha-9-stable-1.jar \
- %{buildroot}%{_javadir}/plexus/container-default.jar
+ %{buildroot}%{_javadir}/%{parent}/%{subname}.jar
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
+%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -100,8 +103,8 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
+%{_javadir}/%{parent}
+%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
@@ -109,6 +112,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Fri Aug 26 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0:1.0-0.6.a9
+- Fix add_maven_depamp macro call with correct path
+
* Wed Aug 24 2011 Tomas Radej <tradej(a)redhat.com> - 0:1.0-0.5.a9
- Update to 1.0-alpha-9-stable-1
- Adapted to building with maven
12 years, 7 months