rpms/sat4j/devel sat4j-classpath.patch, NONE, 1.1 sources, 1.6, 1.7 .cvsignore, 1.6, 1.7 sat4j.spec, 1.12, 1.13 sat4j-fetch.sh, 1.4, 1.5

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/sat4j/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21899/devel

Modified Files:
	sources .cvsignore sat4j.spec sat4j-fetch.sh 
Added Files:
	sat4j-classpath.patch 
Log Message:
Fix classpath in manifest.

sat4j-classpath.patch:
 MANIFEST.MF |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE sat4j-classpath.patch ---
--- org.sat4j.pb/META-INF/MANIFEST.MF.sav	2010-03-26 15:20:38.390630122 +0200
+++ org.sat4j.pb/META-INF/MANIFEST.MF	2010-03-26 15:20:50.549378523 +0200
@@ -21,5 +21,4 @@ Specification-Vendor: Daniel Le Berre
 Implementation-Title: SAT4J
 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	7 Mar 2010 14:36:44 -0000	1.6
+++ sources	26 Mar 2010 13:29:18 -0000	1.7
@@ -1 +1 @@
-61a2bb0923490e6c34c6fa66b83152c2  sat4j-2.1.1.tar.bz2
+8da25ea552baa3e7fc47974aafc0efbc  sat4j-2.1.1.tar.lzma


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	7 Mar 2010 14:36:44 -0000	1.6
+++ .cvsignore	26 Mar 2010 13:29:18 -0000	1.7
@@ -4,3 +4,4 @@ sat4j-2.0.3.tar.bz2
 sat4j-2.1.0.RC2.tar.bz2
 sat4j-2.1.0.tar.bz2
 sat4j-2.1.1.tar.bz2
+sat4j-2.1.1.tar.lzma


Index: sat4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sat4j.spec	7 Mar 2010 14:36:44 -0000	1.12
+++ sat4j.spec	26 Mar 2010 13:29:18 -0000	1.13
@@ -4,15 +4,16 @@
 
 Name:           sat4j
 Version:        2.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A library of SAT solvers written in Java
 
 Group:          Development/Libraries
 License:        EPL and LGPLv2
 URL:            http://www.sat4j.org/
 # Created by sh %{name}-fetch.sh
-Source0:        %{name}-%{version}.tar.bz2
+Source0:        %{name}-%{version}.tar.lzma
 Source1:        %{name}-fetch.sh
+Patch0:         %{name}-classpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel >= 1:1.6
@@ -31,6 +32,7 @@ without worrying about the details.
 
 %prep
 %setup -q
+%patch0
 
 # Only used for the tests
 rm lib/commons-cli.jar
@@ -55,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/org.sat4j*
 
 %changelog
+* Fri Mar 26 2010 Alexander Kurtakov <akurtako at redhat.com> 2.1.1-2
+- Switch to lzma tarball.
+- Remove classpath in manifest.
+
 * Sun Mar 7 2010 Alexander Kurtakov <akurtako at redhat.com> 2.1.1-1
 - Update to 2.1.1.
 


Index: sat4j-fetch.sh
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j-fetch.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sat4j-fetch.sh	7 Mar 2010 14:36:44 -0000	1.4
+++ sat4j-fetch.sh	26 Mar 2010 13:29:18 -0000	1.5
@@ -12,4 +12,4 @@ svn co svn://svn.forge.objectweb.org/svn
 
 popd
 # create archive
-tar -cjf $tar_name.tar.bz2 $tar_name
+tar -caf $tar_name.tar.lzma $tar_name