[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ocaml-bisect/devel bisect-1.0-thread.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 ocaml-bisect.spec, 1.8, 1.9 sources, 1.2, 1.3 bisect-1.0-alpha-nojava.patch, 1.1, NONE



Author: rjones

Update of /cvs/pkgs/rpms/ocaml-bisect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14740

Modified Files:
	.cvsignore ocaml-bisect.spec sources 
Added Files:
	bisect-1.0-thread.patch 
Removed Files:
	bisect-1.0-alpha-nojava.patch 
Log Message:
- Update to non-alpha 1.0 (requested by upstream author).                       
- Use upstream RPM 4.8 OCaml dependency generator.                              
- Use %%global instead of %%define.                                             
- Define PATH_OCAML_BIN to work around strangeness in Makefile.                 
- Remove nojava patch.                                                          
- Add patch to fix build of thread code.                                        
- Rechecked in rpmlint.                                                         


bisect-1.0-thread.patch:
 Makefile |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bisect-1.0-thread.patch ---
--- bisect-1.0.orig/Makefile	2009-12-17 18:31:35.000000000 +0000
+++ bisect-1.0/Makefile	2010-01-05 17:50:51.004080987 +0000
@@ -112,14 +112,14 @@
 	mv *.cm* $(PATH_BIN)
 	$(OCAMLC) -c -I $(PATH_BIN) $(PATH_SRC)/$(THREAD_MODULE).mli
 	cp $(PATH_SRC)/$(THREAD_MODULE).cmi $(PATH_BIN)
-	$(OCAMLC) -c -I $(PATH_BIN) $(PATH_SRC)/$(THREAD_MODULE).ml
+	$(OCAMLC) -thread -I +threads -c -I $(PATH_BIN) $(PATH_SRC)/$(THREAD_MODULE).ml
 	mv $(PATH_SRC)/$(THREAD_MODULE).cmo $(PATH_BIN)
 
 	$(OCAMLOPT) -I $(PATH_SRC) -pack -o $(LIBRARY).cmx $(PATH_SRC)/common.cmx $(PATH_SRC)/runtime.cmx
 	$(OCAMLOPT) -a -o $(LIBRARY).cmxa $(LIBRARY).cmx
 	mv *.cm* *.a $(PATH_BIN)
 	rm *.o
-	$(OCAMLOPT) -c -I $(PATH_BIN) $(PATH_SRC)/$(THREAD_MODULE).ml
+	$(OCAMLOPT) -thread -I +threads -c -I $(PATH_BIN) $(PATH_SRC)/$(THREAD_MODULE).ml
 	mv $(PATH_SRC)/$(THREAD_MODULE).cmx $(PATH_SRC)/$(THREAD_MODULE).o $(PATH_BIN)
 
 ifeq ($(OCAMLJAVA_AVAILABLE),yes)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bisect/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	25 Aug 2008 12:03:58 -0000	1.2
+++ .cvsignore	5 Jan 2010 17:59:11 -0000	1.3
@@ -1 +1 @@
-bisect-1.0-alpha.tar.gz
+bisect-1.0.tar.gz


Index: ocaml-bisect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bisect/devel/ocaml-bisect.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ocaml-bisect.spec	30 Dec 2009 13:54:20 -0000	1.8
+++ ocaml-bisect.spec	5 Jan 2010 17:59:11 -0000	1.9
@@ -1,31 +1,27 @@
-%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%define debug_package %{nil}
-
-%define mainversion 1.0
-%define subversion alpha
+%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%global debug_package %{nil}
 
 Name:           ocaml-bisect
-Version:        %{mainversion}
-Release:        0.7.%{subversion}%{?dist}
+Version:        1.0
+Release:        1%{?dist}
 Summary:        OCaml code coverage tool
 
 Group:          Development/Libraries
 License:        GPLv3+
-URL:            http://bisect.x9c.fr/
-Source0:        http://bisect.x9c.fr/distrib/bisect-%{mainversion}-%{subversion}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
 
-Patch0:         bisect-1.0-alpha-nojava.patch
+URL:            http://bisect.x9c.fr/
+Source0:        http://bisect.x9c.fr/distrib/bisect-%{version}.tar.gz
+
+Patch0:         bisect-1.0-thread.patch
 
 BuildRequires:  ocaml >= 3.10.0
 BuildRequires:  ocaml-findlib-devel
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-camlp4-devel
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires_opts -i Asttypes -i Parsetree
 
 
 %description
@@ -48,12 +44,17 @@ developing applications that use %{name}
 
 
 %prep
-%setup -q -n bisect-%{mainversion}-%{subversion}
+%setup -q -n bisect-%{version}
 %patch0 -p1
 
 
 %build
-make all
+make PATH_OCAML_BIN=%{_bindir} all
+
+
+# Works when run by hand, fails from rpmbuild.  Probably a tty issue.
+#%check
+#make PATH_OCAML_BIN=%{_bindir} tests
 
 
 %install
@@ -97,6 +98,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan  5 2010 Richard W.M. Jones <rjones redhat com> - 1.0-1
+- Update to non-alpha 1.0 (requested by upstream author).
+- Use upstream RPM 4.8 OCaml dependency generator.
+- Use %%global instead of %%define.
+- Define PATH_OCAML_BIN to work around strangeness in Makefile.
+- Remove nojava patch.
+- Add patch to fix build of thread code.
+- Rechecked in rpmlint.
+
 * Wed Dec 30 2009 Richard W.M. Jones <rjones redhat com> - 1.0-0.7.alpha
 - Rebuild for OCaml 3.11.2.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-bisect/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	25 Aug 2008 12:03:58 -0000	1.2
+++ sources	5 Jan 2010 17:59:11 -0000	1.3
@@ -1 +1 @@
-2285c0af8d0e7503fbd0283a48cba944  bisect-1.0-alpha.tar.gz
+275bf4760cb9f256820f0846d7c0ee20  bisect-1.0.tar.gz


--- bisect-1.0-alpha-nojava.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]