dist-git conversion

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-07-29 04:44:21 +00:00 · 2009-11-26 01:20:39 +00:00 · 2008-04-24 17:08:46 +00:00 · 2008-04-24 16:15:30 +00:00 · 2008-04-24 15:31:12 +00:00
3 changed files with 9 additions and 29 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/21
+++ b/21
@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-findlib
-# $Id$
-NAME := ocaml-findlib
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
--- a/ocaml-findlib.spec
+++ b/ocaml-findlib.spec
@ -3,7 +3,7 @@

 Name:           ocaml-findlib
 Version:        1.2.1
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        Objective CAML package manager and build helper

 Group:          Development/Libraries
@ -12,17 +12,13 @@ URL:            http://projects.camlcity.org/projects/findlib.html
 Source0:        http://download.camlcity.org/download/findlib-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

-BuildRequires:  ocaml >= 3.10.2
-BuildRequires:  ocaml-camlp4-devel
-BuildRequires:  ocaml-labltk-devel
+BuildRequires:  ocaml >= 3.09.2
+BuildRequires:  camlp4
+BuildRequires:  labltk
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  m4, ncurses-devel
 BuildRequires:  gawk

-%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
-
 %description
 Objective CAML package manager and build helper.

@ -106,6 +102,11 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Thu Apr 24 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-5
+- Removed dependency generation for EL-4.
+- ocaml-camlp4 -> camlp4, ocaml-labltk -> labltk for this ancient
+  version of OCaml.
+
 * Mon Apr 21 2008 Richard W.M. Jones <rjones@redhat.com> - 1.2.1-3
 - New upstream URLs.
Author	SHA1	Message	Date
Fedora Release Engineering	7af099ec75	dist-git conversion	2010-07-29 04:44:21 +00:00
Bill Nottingham	9d58da1639	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:20:39 +00:00
Richard W.M. Jones	9c5a4744a0	- Removed dependency generation for EL-4. - ocaml-camlp4 -> camlp4, ocaml-labltk -> labltk for this ancient version of OCaml.	2008-04-24 17:08:46 +00:00
Richard W.M. Jones	43a9e2fab8	- Removed dependency generation for EL-4.	2008-04-24 16:15:30 +00:00
Kevin Fenzi	e50a069b04	Initialize branch EL-4 for ocaml-findlib	2008-04-24 15:31:12 +00:00