[sat4j/f15/master] - Update to 2.3.0.
by Chris Aniszczyk
commit 32a90b6011184e5b2e760a82087d49175d14b8d7
Author: Chris Aniszczyk <zx(a)redhat.com>
Date: Mon Apr 4 12:31:04 2011 -0500
- Update to 2.3.0.
.gitignore | 1 +
sat4j-fetch.sh | 4 ++--
sat4j.spec | 7 +++++--
sources | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41364b8..ca4f871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ sat4j-2.1.0.tar.bz2
sat4j-2.1.1.tar.bz2
sat4j-2.1.1.tar.lzma
sat4j-2.2.0.tar.xz
+sat4j-2.3.0.tar.xz
diff --git a/sat4j-fetch.sh b/sat4j-fetch.sh
index 73c0708..faf336e 100644
--- a/sat4j-fetch.sh
+++ b/sat4j-fetch.sh
@@ -1,7 +1,7 @@
#!/bin/sh
name=sat4j
-tag=ECLIPSE_3_6
-version=2.2.0
+tag=org.sat4j.pom-2.3.0
+version=2.3.0
tar_name=$name-$version
rm -fr $tar_name && mkdir $tar_name
diff --git a/sat4j.spec b/sat4j.spec
index c1423dd..fb90ca5 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -3,8 +3,8 @@
%global qualifier 20100429
Name: sat4j
-Version: 2.2.0
-Release: 2%{?dist}
+Version: 2.3.0
+Release: 1%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/org.sat4j*
%changelog
+* Mon Apr 04 2011 Chris Aniszczyk <zx(a)redhat.com> 2.3.0-1
+- Update to 2.3.0.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 7f954db..7ceda3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bbf217038fd9b1df5178a588ca1d2c9 sat4j-2.2.0.tar.xz
+aacb839425184b8059d8471083558960 sat4j-2.3.0.tar.xz
13 years
[maven-dependency-plugin] Update to 2.2 final release.
by Alexander Kurtakov
commit 59b5438b8858e0c05634ebf2c90158545623c025
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 26 15:23:58 2011 +0300
Update to 2.2 final release.
.gitignore | 1 +
maven-dependency-plugin.spec | 44 ++++++++++++-----------------------------
sources | 2 +-
3 files changed, 15 insertions(+), 32 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d30e15..46d6b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-dependency-plugin-2.2.tar.xz
+/maven-dependency-plugin-2.2-source-release.zip
diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec
index 872c336..29d692d 100644
--- a/maven-dependency-plugin.spec
+++ b/maven-dependency-plugin.spec
@@ -1,17 +1,12 @@
Name: maven-dependency-plugin
Version: 2.2
-Release: 0.4.svn949573%{?dist}
+Release: 1%{?dist}
Summary: Plugin to manipulate, copy and unpack local and remote artifacts
Group: Development/Libraries
License: ASL 2.0
URL: http://maven.apache.org/plugins/%{name}
-# we are not using release tag 2.1 because last release has problems with
-# our dependencies and there are 2 outstanding bugs before 2.2 release.
-# svn export -r 949573 http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-dependency-plugin maven-dependency-plugin-2.2
-# tar caf maven-dependency-plugin-2.2.tar.xz maven-dependency-plugin-2.2
-Source0: %{name}-%{version}.tar.xz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
BuildArch: noarch
@@ -19,7 +14,7 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: plexus-utils
BuildRequires: ant-nodeps
BuildRequires: asm2
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-install-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-plugin-plugin
@@ -31,7 +26,7 @@ BuildRequires: maven-javadoc-plugin
BuildRequires: maven-shared-dependency-analyzer
BuildRequires: maven-shared-dependency-tree
BuildRequires: maven-shared-common-artifact-filters
-Requires: maven2
+Requires: maven
Requires: jpackage-utils
Requires: java
Requires: maven-shared-common-artifact-filters
@@ -58,31 +53,21 @@ Requires: jpackage-utils
%prep
-%setup -q #You may need to update this according to your Source0
+%setup -q
-# we have newer classworlds in Fedora, so fix test case
sed -i \
's:org.codehaus.classworlds.ClassRealm:org.codehaus.plexus.classworlds.realm.ClassRealm:' \
src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
+
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-# tests failures are ignored because they are failing in jpp mode
-# Need more time to investigate/fix this
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+mvn-rpmbuild \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
-install -Dpm 644 target/%{name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
@@ -90,10 +75,8 @@ install -Dpm 644 target/%{name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/
install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -101,9 +84,6 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/*
@@ -112,10 +92,12 @@ rm -rf %{buildroot}
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Tue Apr 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-1
+- Update to 2.2 final release.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-0.4.svn949573
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 09db71a..9d06924 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-040ef38f8633b11ca0cf8fe63eb1f2a5 maven-dependency-plugin-2.2.tar.xz
+eaf703fd03dbfa3e0f78430623bbd63a maven-dependency-plugin-2.2-source-release.zip
13 years
[maven-wagon] Install wagon-providers depmap too.
by Alexander Kurtakov
commit 497ad0169c45efb1d8ce1b70b9fdc7343b425307
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 26 15:03:01 2011 +0300
Install wagon-providers depmap too.
maven-wagon.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/maven-wagon.spec b/maven-wagon.spec
index f6e8958..9d9262c 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -37,7 +37,7 @@
Name: maven-%{bname}
Version: 1.0
-Release: 0.3.b7.21%{?dist}
+Release: 0.3.b7.22%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
@@ -228,6 +228,7 @@ install -m 644 \
%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
%add_to_maven_depmap org.apache.maven.wagon wagon %{version} JPP/%{name} wagon
+%add_to_maven_depmap org.apache.maven.wagon wagon-providers %{version} JPP/%{name} providers
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -298,6 +299,9 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Tue Apr 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.3.b7.22
+- Install wagon-providers depmap too.
+
* Tue Apr 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.3.b7.21
- Install wagon pom depmap.
- Use maven 3 for build.
13 years
[maven-wagon] Install wagon pom depmap.
by Alexander Kurtakov
commit 5b2093c926a5720b7dd637c38315dd20dc8d5c4d
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Apr 26 14:46:18 2011 +0300
Install wagon pom depmap.
Use maven 3 for build.
maven-wagon.spec | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/maven-wagon.spec b/maven-wagon.spec
index 1e2d85d..f6e8958 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -37,7 +37,7 @@
Name: maven-%{bname}
Version: 1.0
-Release: 0.3.b7.1%{?dist}
+Release: 0.3.b7.21%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
@@ -52,13 +52,11 @@ Source1: wagon-1.0-jpp-depmap.xml
Patch0: wagon-http-shared-pom_xml.patch
Patch1: disable-tck.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: ant >= 0:1.6
BuildRequires: junit
-BuildRequires: maven2 >= 0:2.0.8
+BuildRequires: maven
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
@@ -75,10 +73,9 @@ BuildRequires: maven-scm-test
BuildRequires: xerces-j2
BuildRequires: classworlds
BuildRequires: nekohtml
-BuildRequires: concurrent
BuildRequires: ganymed-ssh2
BuildRequires: apache-commons-codec
-BuildRequires: jakarta-commons-collections
+BuildRequires: apache-commons-collections
BuildRequires: apache-commons-net
BuildRequires: jakarta-commons-httpclient
BuildRequires: apache-commons-logging
@@ -88,7 +85,6 @@ BuildRequires: jtidy
BuildRequires: plexus-container-default
BuildRequires: plexus-interactivity
BuildRequires: plexus-utils
-BuildRequires: tomcat5
BuildRequires: servletapi5
BuildRequires: xml-commons-apis
BuildRequires: easymock
@@ -118,6 +114,7 @@ following providers:
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -148,19 +145,13 @@ rm -f wagon-providers/wagon-http/src/test/java/org/apache/maven/wagon/providers/
rm -f wagon-provider-test/src/main/java/org/apache/maven/wagon/http/HttpWagonTestCase.java
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp \
+mvn-rpmbuild \
-e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE1} \
- -Dmaven.test.failure.ignore=true \
+ -Dmaven.local.depmap.file=%{SOURCE1} \
-Dmaven.test.skip=true \
install javadoc:aggregate
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -236,6 +227,8 @@ install -m 644 \
$RPM_BUILD_ROOT%{_javadir}/%{name}/provider-test.jar
%add_to_maven_depmap org.apache.maven.wagon wagon-provider-test %{version} JPP/%{name} provider-test
+%add_to_maven_depmap org.apache.maven.wagon wagon %{version} JPP/%{name} wagon
+
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml \
@@ -293,8 +286,8 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%files
%defattr(-,root,root,-)
%{_javadir}/*
-%{_datadir}/maven2/poms/*.pom
-%{_mavendepmapfragdir}
+%{_mavenpomdir}/*.pom
+%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
@@ -305,6 +298,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Tue Apr 26 2011 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.0-0.3.b7.21
+- Install wagon pom depmap.
+- Use maven 3 for build.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-0.3.b7.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years