rpms/sat4j/devel sat4j-fetch.sh, NONE, 1.1 sources, 1.2, 1.3 .cvsignore, 1.2, 1.3 sat4j.spec, 1.7, 1.8 sat4j-core-nooverrides.patch, 1.1, NONE sat4j-junit4fortests.patch, 1.1, NONE sat4j-core-Dimacs-nooverrides.patch, 1.1, NONE

Thu Feb 26 15:33:27 UTC 2009

Author: akurtakov

Update of /cvs/pkgs/rpms/sat4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32100/devel

Modified Files:
	sources .cvsignore sat4j.spec 
Added Files:
	sat4j-fetch.sh 
Removed Files:
	sat4j-core-nooverrides.patch sat4j-junit4fortests.patch 
	sat4j-core-Dimacs-nooverrides.patch 
Log Message:
Update to 2.0.3

--- NEW FILE sat4j-fetch.sh ---
#!/bin/sh
name=sat4j
tag=2_0_3
version=2.0.3
tar_name=$name-$version

rm -fr $tar_name && mkdir $tar_name
pushd $tar_name

# Fetch plugins
svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/2_0_3 .

popd
# create archive
tar -cjf $tar_name.tar.bz2 $tar_name


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Jul 2008 16:13:34 -0000	1.2
+++ sources	26 Feb 2009 15:32:56 -0000	1.3
@@ -1,2 +1 @@
-20869e6d0b69d5ad177d722d9cc6b481  org.sat4j.core-src.zip
-3ec2679335bb11cc76fe9f6ddff020fe  org.sat4j.pb-src.zip
+5bd60ff7fa9f53e709b8309c5c0c58e6  sat4j-2.0.3.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Jul 2008 16:13:34 -0000	1.2
+++ .cvsignore	26 Feb 2009 15:32:57 -0000	1.3
@@ -1,2 +1,3 @@
 org.sat4j.core-src.zip
 org.sat4j.pb-src.zip
+sat4j-2.0.3.tar.bz2


Index: sat4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sat4j.spec	25 Feb 2009 22:35:40 -0000	1.7
+++ sat4j.spec	26 Feb 2009 15:32:57 -0000	1.8
@@ -1,31 +1,22 @@
 %define eclipse_base %{_libdir}/eclipse
 # We want the version to match that shipped in Eclipse's Orbit project
-%define sat4jversion 2.0.0.v20080602
+%define qualifier 20081021
 
 Name:           sat4j
-Version:        2.0.0
-Release:        8%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 Summary:        A library of SAT solvers written in Java
 
 Group:          Development/Libraries
 License:        EPL and LGPLv2
 URL:            http://www.sat4j.org/
-Source0: http://forge.objectweb.org/tracker/download.php/228/350289/310427/1838/org.sat4j.core-src.zip
-Source1: http://forge.objectweb.org/tracker/download.php/228/350289/310427/1839/org.sat4j.pb-src.zip
-# These have been reported upstream
-# http://forge.objectweb.org/tracker/index.php?func=detail&aid=310427&group_id=228&atid=350289
-# There are erroneous @Overrides statements which are caught with ecj.
-# We remove them.
-Patch0:         sat4j-core-nooverrides.patch
-Patch1:         sat4j-core-Dimacs-nooverrides.patch
-# This is so we can run the tests.  Some errors are expected; see up for
-# OW tracker thread.
-Patch2:         sat4j-junit4fortests.patch
+# Created by sh %{name}-fetch.sh
+Source0:        %{name}-%{version}.tar.bz2
+Source1:        %{name}-fetch.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1:1.6
-BuildRequires:  junit4
-BuildRequires:  eclipse-pde
+BuildRequires:  ant
 Requires:       java >= 1:1.6
 Requires:       jpackage-utils
 
@@ -38,136 +29,20 @@
 without worrying about the details.
 
 %prep
-%setup -q -c -a 1
-/bin/sh %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-# Remove existing sat4j plugins so we build against this source
-rm SDK/plugins/org.sat4j*
+%setup -q
 
-pushd core
 # Only used for the tests
-rm lib/jmock-*.jar
-
-echo %{sat4jversion} > src/sat4j.version
-sed -i "s/9.9.9.token/%{sat4jversion}/" META-INF/MANIFEST.MF 
-%patch0 -p0
-%patch1 -p0
-mv build{,.upstream}
-cd build.upstream
-%patch2 -p0
-sed -i "s:/usr/share/java:%{_datadir}/java:" build.xml
-popd
-
-pushd pb
-sed -i "s/9.9.9.token/%{sat4jversion}/" META-INF/MANIFEST.MF 
-sed -i "/^Class-Path/d" META-INF/MANIFEST.MF 
-# Only used for the tests
-rm lib/jmock-*.jar
-popd
-
-# I don't think package build can handle DOS line endings in MANIFEST.MF
-sed -i 's/\r//' core/META-INF/MANIFEST.MF
-sed -i 's/\r//' pb/META-INF/MANIFEST.MF
+rm lib/commons-cli.jar
 
 %build
-SDK=$(cd SDK > /dev/null && pwd)
-
-pushd core
-mkdir home build
-home=$(cd home > /dev/null && pwd)
-
-# These can go away when package build handles plugins (not just
-# features)
-echo "<project default=\"main\"><target name=\"main\"></target></project>" \
- > build/assemble.org.sat4j.core.all.xml
-echo "<project default=\"main\"><target name=\"main\"></target></project>" \
- > build/package.org.sat4j.core.all.xml
-
-pdeBuildVersion=$(ls $SDK/plugins | \
-  grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
-java -cp $SDK/startup.jar \
- -Duser.home=$home \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=plugin \
- -DjavacSource=1.5 \
- -DjavacTarget=1.5 \
- -Did=org.sat4j.core \
- -DbaseLocation=$SDK \
- -DsourceDirectory=$(pwd) \
- -DbuildDirectory=$(pwd)/build \
- -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/templates/package-build \
- -f $SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/scripts/build.xml
-
-pushd build/plugins/org.sat4j.core/
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$home \
- -f build.xml \
- build.update.jar
-popd
-popd
-
-# pb depends upon core
-cp -rp core/build/plugins/org.sat4j.core/org.sat4j.core_*.jar \
- $SDK/plugins
-
-# the class-path in pb's MANIFEST.MF references a versionless core jar.
-CORE_VERSION=$(ls $SDK/plugins | grep org.sat4j.core | \
- sed 's/org.sat4j.core_//')
-sed -i "s/org.sat4j.core.jar/org.sat4j.core_$CORE_VERSION/" \
- pb/META-INF/MANIFEST.MF
- 
-pushd pb
-mkdir home build
-home=$(cd home > /dev/null && pwd)
-
-# These can go away when package build handles plugins (not just
-# features)
-echo "<project default=\"main\"><target name=\"main\"></target></project>" \
- > build/assemble.org.sat4j.pb.all.xml
-echo "<project default=\"main\"><target name=\"main\"></target></project>" \
- > build/package.org.sat4j.pb.all.xml
-
-java -cp $SDK/startup.jar \
- -Duser.home=$home \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=plugin \
- -DjavacSource=1.5 \
- -DjavacTarget=1.5 \
- -Did=org.sat4j.pb \
- -DbaseLocation=$SDK \
- -DsourceDirectory=$(pwd) \
- -DbuildDirectory=$(pwd)/build \
- -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/templates/package-build \
- -f $SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/scripts/build.xml
-
-pushd build/plugins/org.sat4j.pb
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Duser.home=$home \
- -f build.xml \
- build.update.jar
-popd
-popd
-
-# For testing
-#cd core/build.upstream
-#mkdir -p bin report/junit
-#ant tests
+ant -Drelease=%{version} -DBUILD_DATE=%{qualifier} p2 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -rp core/build/plugins/org.sat4j.core/org.sat4j.core_*.jar \
+cp -rp dist/%{version}/org.sat4j.core.jar \
  $RPM_BUILD_ROOT%{_javadir}
-cp -rp pb/build/plugins/org.sat4j.pb/org.sat4j.pb_*.jar \
+cp -rp dist/%{version}/org.sat4j.pb.jar \
  $RPM_BUILD_ROOT%{_javadir}
 
 %clean
@@ -179,6 +54,9 @@
 %{_javadir}/org.sat4j*
 
 %changelog
+* Thu Feb 26 2009 Alexander Kurtakov <akurtako at redhat.com> 2.0.3-1
+- Update to 2.0.3.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- sat4j-core-nooverrides.patch DELETED ---


--- sat4j-junit4fortests.patch DELETED ---


--- sat4j-core-Dimacs-nooverrides.patch DELETED ---


