From 2d5bcbc99e51e98dabaf20607efb03ca4050b21aedc143a852c36b551f43e267 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 13 Nov 2012 16:52:52 +0000 Subject: [PATCH] - BuildRequire just camlp4 to allow build within sles11 [fate#312159] OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=7 --- ocaml-findlib.changes | 2 +- ocaml-findlib.spec | 169 +++++++----------------------------------- 2 files changed, 27 insertions(+), 144 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 0e035eb..688d8dc 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Sep 18 15:38:11 CEST 2012 - ohering@suse.de -- BuildRequire just camlp4 to allow build within sles11 +- BuildRequire just camlp4 to allow build within sles11 [fate#312159] ------------------------------------------------------------------- Sun Sep 16 20:05:17 CEST 2012 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index affa883..8db5f81 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -1,10 +1,21 @@ -# This spec file is derived from the the Fedora distribution as of -# 2010-12-14. - -# This file was originally available under the Fedora Contributor -# License Agreement (CLA), which permits relicensing. - +# +# spec file for package ocaml-findlib +# +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010-2011 Andrew Psaltis +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files @@ -26,30 +37,29 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# norootforbuild - %define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) Name: ocaml-findlib Version: 1.3.3 -Release: 3 +Release: 0 Summary: Objective CAML package manager and build helper - -Group: Development/Libraries/Other License: MIT -URL: http://projects.camlcity.org/projects/findlib.html +Group: Development/Libraries/Other + +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) +BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: sparc64 s390 s390x Provides: ocamlfind = %{version} -BuildRequires: ocaml BuildRequires: camlp4 +BuildRequires: ocaml #BuildRequires: labltk -BuildRequires: ocaml-ocamldoc -BuildRequires: m4, ncurses-devel BuildRequires: gawk +BuildRequires: m4 +BuildRequires: ncurses-devel +BuildRequires: ocaml-ocamldoc %description Findlib is a library manager for Objective Caml. It provides a @@ -72,7 +82,6 @@ developing applications that use %{name}. %prep %setup -q -n findlib-%{version} - %build (cd tools/extract_args && make) tools/extract_args/extract_args -o src/findlib/ocaml_args.ml ocamlc ocamlcp ocamlmktop ocamlopt ocamldep ocamldoc ||: @@ -88,7 +97,6 @@ make opt %endif rm doc/guide-html/TIMESTAMP - %install rm -rf $RPM_BUILD_ROOT # Grrr destdir grrrr @@ -133,7 +141,6 @@ rm -rf $RPM_BUILD_ROOT #%%exclude %%{_libdir}/ocaml/findlib/make_wizard #%%exclude %%{_libdir}/ocaml/findlib/make_wizard.pattern - %files devel %defattr(-,root,root,-) %doc LICENSE doc/README doc/guide-html @@ -147,128 +154,4 @@ rm -rf $RPM_BUILD_ROOT #%%{_libdir}/ocaml/findlib/make_wizard #%%{_libdir}/ocaml/findlib/make_wizard.pattern - %changelog -* Wed Apr 20 2011 Andrew Psaltis - 1.2.6-5 -- Use internal dependency generator (wheeee) - -* Fri Jan 7 2011 Andrew Psaltis - 1.2.6-4 -- Pass environment variables to find-requires - -* Tue Dec 14 2010 Andrew Psaltis - 1.2.6-3 -- Actually depend on ocaml - -* Tue Dec 14 2010 Andrew Psaltis - 1.2.6-2 -- Make the build work in Factory - -* Tue Dec 14 2010 Andrew Psaltis - 1.2.6-1 -- Modify spec file to work with openSUSE -- Bump version to 1.2.6 - -* Tue Dec 29 2009 Richard W.M. Jones - 1.2.5-4 -- Rebuild for OCaml 3.11.2. - -* Wed Dec 16 2009 Richard W.M. Jones - 1.2.5-3 -- Use __ocaml_requires_opts / __ocaml_provides_opts. - -* Wed Dec 16 2009 Richard W.M. Jones - 1.2.5-2 -- Update to use RPM dependency generator. - -* Sun Oct 4 2009 Richard W.M. Jones - 1.2.5-1 -- New upstream version 1.2.5. - -* Sat Jul 25 2009 Fedora Release Engineering - 1.2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri May 22 2009 Richard W.M. Jones - 1.2.4-3 -- Rebuild for OCaml 3.11.1. -- New upstream version 1.2.4. -- camlp4/META patch is now upstream. - -* Thu Apr 16 2009 S390x secondary arch maintainer -- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs - (added sparc64 per request from the sparc maintainer) - -* Wed Feb 25 2009 Fedora Release Engineering - 1.2.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Dec 4 2008 Richard W.M. Jones - 1.2.3-5 -- Change to camlp4/META means that this package really depends on - the latest OCaml compiler. - -* Thu Dec 4 2008 Richard W.M. Jones - 1.2.3-4 -- camlp4/META: camlp4.lib should depend on dynlink. - -* Wed Nov 26 2008 Richard W.M. Jones - 1.2.3-3 -- Rebuild for OCaml 3.11.0+rc1. - -* Fri Nov 20 2008 Richard W.M. Jones - 1.2.3-2 -- Force rebuild. - -* Thu Nov 20 2008 Richard W.M. Jones - 1.2.3-1 -- New upstream version 1.2.3. - -* Wed Nov 19 2008 Richard W.M. Jones - 1.2.2-2 -- Rebuild for OCaml 3.11.0 - -* Sun Aug 31 2008 Richard W.M. Jones - 1.2.2-1 -- New upstream version 1.2.2. -- Strip ocamlfind binary. -- Remove zero-length file. - -* Mon Apr 21 2008 Richard W.M. Jones - 1.2.1-3 -- New upstream URLs. - -* Sat Mar 1 2008 Richard W.M. Jones - 1.2.1-2 -- Experimental rebuild for ppc64. - -* Tue Feb 12 2008 Richard W.M. Jones - 1.2.1-1 -- New upstream version 1.2.1. - -* Thu Sep 6 2007 Richard W.M. Jones - 1.1.2pl1-14 -- Ignore Parsetree module, it's a part of the toplevel. - -* Mon Sep 3 2007 Richard W.M. Jones - 1.1.2pl1-13 -- Bump version to force rebuild against ocaml -6 release. - -* Thu Aug 30 2007 Richard W.M. Jones - 1.1.2pl1-12 -- Added BR: gawk. - -* Thu Aug 30 2007 Richard W.M. Jones - 1.1.2pl1-11 -- Force rebuild because of changed BRs in base OCaml. - -* Thu Aug 2 2007 Richard W.M. Jones - 1.1.2pl1-10 -- BR added ocaml-ocamldoc so that ocamlfind ocamldoc works. -- Fix path of camlp4 parsers in Makefile. - -* Thu Jul 12 2007 Richard W.M. Jones - 1.1.2pl1-9 -- Added ExcludeArch: ppc64 - -* Thu Jul 12 2007 Richard W.M. Jones - 1.1.2pl1-8 -- Expanded tabs to spaces. -- Readded conditional opt section for files. - -* Wed Jul 04 2007 Xavier Lamien - 1.1.2pl1-7 -- Fixed BR. - -* Wed Jun 27 2007 Richard W.M. Jones - 1.1.2pl1-6 -- Fix configure line. -- Install doc/guide-html. -- Added dependency on ncurses-devel. - -* Mon Jun 11 2007 Richard W.M. Jones - 1.1.2pl1-5 -- Build against 3.10. -- Update to latest package guidelines. - -* Sat Jun 2 2007 Richard W.M. Jones - 1.1.2pl1-4 -- Handle bytecode-only architectures. - -* Sat May 26 2007 Richard W.M. Jones - 1.1.2pl1-3 -- Missing builddep m4. - -* Fri May 25 2007 Richard W.M. Jones - 1.1.2pl1-2 -- Use OCaml find-requires and find-provides. - -* Fri May 18 2007 Richard W.M. Jones - 1.1.2pl1-1 -- Initial RPM release. -