[sat4j] Remove jars from source
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed Apr 17 13:01:35 UTC 2013
commit 6c7ff1c9acbf95de97a04da5f5e83038ae1a892c
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed Apr 17 15:01:21 2013 +0200
Remove jars from source
sat4j-fetch.sh | 1 +
sat4j.spec | 19 +++++++++++++++----
sources | 2 +-
3 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/sat4j-fetch.sh b/sat4j-fetch.sh
index 619934c..9a048ab 100755
--- a/sat4j-fetch.sh
+++ b/sat4j-fetch.sh
@@ -9,6 +9,7 @@ pushd $tar_name
# Fetch plugins
svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/$tag .
+find . -name *.jar -delete
popd
# create archive
diff --git a/sat4j.spec b/sat4j.spec
index 1e4b2af..902ad2c 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -3,9 +3,12 @@
%global eclipse_base %{_libdir}/eclipse
+# should be consistent across one release
+%global build_date 20130405
+
Name: %{?scl_prefix}sat4j
Version: 2.3.3
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
@@ -36,11 +39,16 @@ without worrying about the details.
%setup -q -n %{pkg_name}-%{version}
%patch0
-# Only used for the tests
-rm lib/commons-cli.jar
+pushd lib
+ ln -s /usr/share/java/commons-beanutils.jar
+ ln -s /usr/share/java/commons-logging.jar
+ ln -s /usr/share/java/mockito.jar mockito-all-1.9.5.jar
+popd
%build
-ant -Dbuild.compiler=modern -Drelease=%{version} -Dtarget=1.5 p2
+ant -Dbuild.compiler=modern -Drelease=%{version} \
+ -Dtarget=1.5 -DBUILD_DATE=%{build_date} p2
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -59,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/org.sat4j*
%changelog
+* Wed Apr 17 2013 Krzysztof Daniel <kdaniel at redhat.com> 2.3.3-7
+- Remove jars from source.
+
* Fri Apr 5 2013 Krzysztof Daniel <kdaniel at redhat.com> 2.3.0-6
- Update to 2.3.3
- Initial sclization.
diff --git a/sources b/sources
index 3af44e1..16b111a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-438fa0db70fd60f942da8dc8baa78571 sat4j-2.3.3.tar.xz
+4583360323d5a881f0dd32748f0e0274 sat4j-2.3.3.tar.xz
More information about the scm-commits
mailing list