[sat4j] Update to 2.3.3 Initial sclization.
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri Apr 5 07:13:38 UTC 2013
commit 7ec29481aa84e751d5ab65b4d4458430e68eb6e6
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Fri Apr 5 09:13:32 2013 +0200
Update to 2.3.3
Initial sclization.
.gitignore | 3 +++
sat4j-classpath.patch | 2 +-
sat4j-fetch.sh | 4 ++--
sat4j.spec | 30 ++++++++++++++++++------------
sources | 2 +-
5 files changed, 25 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca4f871..60a6884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,6 @@ sat4j-2.1.1.tar.bz2
sat4j-2.1.1.tar.lzma
sat4j-2.2.0.tar.xz
sat4j-2.3.0.tar.xz
+/sat4j-2.3.3.tar.xz
+/noarch
+/sat4j-2.3.3
diff --git a/sat4j-classpath.patch b/sat4j-classpath.patch
index 681b7ad..219bd88 100644
--- a/sat4j-classpath.patch
+++ b/sat4j-classpath.patch
@@ -5,4 +5,4 @@
Implementation-Version: 9.9.9.token
Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois
-Class-Path: org.sat4j.core.jar
- Bundle-RequiredExecutionEnvironment: J2SE-1.4
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/sat4j-fetch.sh b/sat4j-fetch.sh
old mode 100644
new mode 100755
index faf336e..619934c
--- a/sat4j-fetch.sh
+++ b/sat4j-fetch.sh
@@ -1,7 +1,7 @@
#!/bin/sh
name=sat4j
-tag=org.sat4j.pom-2.3.0
-version=2.3.0
+tag=org.sat4j.pom-2.3.3
+version=2.3.3
tar_name=$name-$version
rm -fr $tar_name && mkdir $tar_name
diff --git a/sat4j.spec b/sat4j.spec
index 8a123f0..1e4b2af 100644
--- a/sat4j.spec
+++ b/sat4j.spec
@@ -1,26 +1,28 @@
+%{?scl:%scl_package sat4j}
+%{!?scl:%global pkg_name %{name}}
+
%global eclipse_base %{_libdir}/eclipse
-# We want the version to match that shipped in Eclipse's Orbit project
-%global qualifier 20100429
-Name: sat4j
-Version: 2.3.0
-Release: 5%{?dist}
+Name: %{?scl_prefix}sat4j
+Version: 2.3.3
+Release: 6%{?dist}
Summary: A library of SAT solvers written in Java
Group: Development/Libraries
License: EPL or LGPLv2
URL: http://www.sat4j.org/
-# Created by sh %{name}-fetch.sh
-Source0: %{name}-%{version}.tar.xz
-Source1: %{name}-fetch.sh
-Patch0: %{name}-classpath.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Created by sh %{pkg_name}-fetch.sh
+Source0: %{pkg_name}-%{version}.tar.xz
+Source1: %{pkg_name}-fetch.sh
+Patch0: %{pkg_name}-classpath.patch
+BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel >= 1:1.6
BuildRequires: ant
BuildRequires: ecj
Requires: java >= 1:1.6
Requires: jpackage-utils
+%{?scl:Requires: %scl_runtime}
BuildArch: noarch
@@ -31,14 +33,14 @@ boxes", those willing to embed SAT technologies into their application
without worrying about the details.
%prep
-%setup -q
+%setup -q -n %{pkg_name}-%{version}
%patch0
# Only used for the tests
rm lib/commons-cli.jar
%build
-ant -Dbuild.compiler=modern -Drelease=%{version} -DBUILD_DATE=%{qualifier} -Dtarget=1.5 p2
+ant -Dbuild.compiler=modern -Drelease=%{version} -Dtarget=1.5 p2
%install
rm -rf $RPM_BUILD_ROOT
@@ -57,6 +59,10 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/org.sat4j*
%changelog
+* Fri Apr 5 2013 Krzysztof Daniel <kdaniel at redhat.com> 2.3.0-6
+- Update to 2.3.3
+- Initial sclization.
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 7ceda3d..3af44e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aacb839425184b8059d8471083558960 sat4j-2.3.0.tar.xz
+438fa0db70fd60f942da8dc8baa78571 sat4j-2.3.3.tar.xz
More information about the scm-commits
mailing list