rpms/spring-installer/devel spring-installer-20090316-systemcamlzip.patch, 1.1, 1.2 spring-installer.spec, 1.3, 1.4

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/spring-installer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27441

Modified Files:
	spring-installer-20090316-systemcamlzip.patch 
	spring-installer.spec 
Log Message:
* Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-6
- fix patch and buildreq


spring-installer-20090316-systemcamlzip.patch:

Index: spring-installer-20090316-systemcamlzip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/devel/spring-installer-20090316-systemcamlzip.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- spring-installer-20090316-systemcamlzip.patch	18 Mar 2009 06:52:11 -0000	1.1
+++ spring-installer-20090316-systemcamlzip.patch	4 Apr 2009 14:34:19 -0000	1.2
@@ -1,12 +1,12 @@
 diff -up ./Makefile.systemcamlzip ./Makefile
---- ./Makefile.systemcamlzip	2009-03-17 21:51:18.000000000 +0100
-+++ ./Makefile	2009-03-17 21:52:16.000000000 +0100
+--- ./Makefile.systemcamlzip	2009-03-16 11:53:54.000000000 +0100
++++ ./Makefile	2009-04-04 11:19:10.000000000 +0200
 @@ -35,7 +35,7 @@ endif
  all: spring-installer ca-installer
  
  CAMLZIP = camlzip-1.04
 -CAMLZIP_FLAGS = -I $(CAMLZIP) zip.cmxa
-+CAMLZIP_FLAGS = zip.cmxa
++CAMLZIP_FLAGS = $(shell ocamlfind query -predicates "native,archive,mt" -format "-I %d %a" zip) zip.cmxa
  
  CAMLSEVENZIP = camlsevenzip
  CAMLSEVENZIP_FLAGS = -I $(CAMLSEVENZIP) sevenzip.cmxa


Index: spring-installer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring-installer/devel/spring-installer.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spring-installer.spec	4 Apr 2009 08:26:43 -0000	1.3
+++ spring-installer.spec	4 Apr 2009 14:34:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           spring-installer
 Version:        20090316
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Installer for the Spring game's maps and mods
 
 Group:          Amusements/Games
@@ -14,7 +14,7 @@
 BuildRequires:  ocaml-ocamlnet-devel, ocaml-pcre-devel, chrpath, desktop-file-utils
 BuildRequires:  gtk2-devel
 %if 0%{?fedora} >= 11
-BuildRequires:  ocaml-zip >= 1.04
+BuildRequires:  ocaml-zip-devel >= 1.04
 %endif
 
 # For execstack
@@ -129,6 +129,9 @@
 
 
 %changelog
+* Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-6
+- fix patch and buildreq
+
 * Sat Apr 04 2009 Aurelien Bompard <abompard at fedoraproject.org> 20090316-5
 - fix versioned dependency