From fbb67602d394bec80f14175495fe55e6363cdf08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Milmeister?= Date: Sat, 7 Jul 2007 12:32:26 +0000 Subject: [PATCH] update to cvs version --- .cvsignore | 2 +- lablgtk.spec => ocaml-lablgtk.spec | 122 +++++++++++++++++++++-------- sources | 2 +- 3 files changed, 90 insertions(+), 36 deletions(-) rename lablgtk.spec => ocaml-lablgtk.spec (62%) diff --git a/.cvsignore b/.cvsignore index fb4bb60..85c0f88 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -lablgtk-2.6.0.tar.gz +lablgtk2-20060908.tar.gz diff --git a/lablgtk.spec b/ocaml-lablgtk.spec similarity index 62% rename from lablgtk.spec rename to ocaml-lablgtk.spec index f301038..d3fc74a 100644 --- a/lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -1,36 +1,41 @@ -%define ocaml_version 3.09.3 +%define debug_package %{nil} -Name: lablgtk +Name: ocaml-lablgtk Version: 2.6.0 -Release: 7%{?dist} +Release: 8.20060908cvs%{?dist} Summary: Objective Caml interface to gtk+ Group: System Environment/Libraries License: LGPL URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html -Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz +Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk2-20060908.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ocaml = %ocaml_version -BuildRequires: camlp4 = %ocaml_version -# lablgtk can generate quite extensive documentation. -# Probably should enable this and create a subpackage for it. -BuildRequires: ocaml-ocamldoc -BuildRequires: lablgl >= 1.02 -BuildRequires: gtkglarea2-devel -BuildRequires: zlib-devel -BuildRequires: gtk2-devel -BuildRequires: libglade2-devel -BuildRequires: librsvg2-devel -BuildRequires: libgnomeui-devel -BuildRequires: libgnomecanvas-devel + +Obsoletes: lablgtk <= 2.6.0-7 +Provides: lablgtk = 2.6.0-7 + +BuildRequires: ncurses-devel BuildRequires: gnome-panel-devel +BuildRequires: gtk2-devel +BuildRequires: gtkglarea2-devel BuildRequires: gtkspell-devel BuildRequires: libXmu-devel -BuildRequires: ncurses-devel +BuildRequires: libglade2-devel +BuildRequires: libgnomecanvas-devel +BuildRequires: libgnomeui-devel +BuildRequires: librsvg2-devel +BuildRequires: ocaml +BuildRequires: ocaml-camlp4-devel +BuildRequires: ocaml-lablgl-devel +BuildRequires: ocaml-ocamldoc +BuildRequires: zlib-devel +ExcludeArch: ppc64 -Requires: ocaml = %ocaml_version -Requires: lablgl >= 1.02 + +%define _use_internal_dependency_generator 0 +%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh +%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh %description @@ -45,17 +50,26 @@ gtk+. %package doc Group: System Environment/Libraries Summary: Documentation for LablGTK -Requires: lablgtk = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description doc -Documentation for LablGTK. +Documentation for %{name}. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and signature files for +developing applications that use %{name}. %prep -%setup -q -#%patch0 -p1 -b .gcc4 +%setup -q -n lablgtk2 # version information in META file is wrong -perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META +perl -pi -e 's|version="1.3.1"|version="%{version}"|' META %build @@ -67,10 +81,10 @@ make doc %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} \ - $RPM_BUILD_ROOT%{_libdir} \ - $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \ - $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_libdir} +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 +mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ LIBDIR=$RPM_BUILD_ROOT%{_libdir} \ @@ -78,6 +92,19 @@ make install \ DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 +# Remove unnecessary *.ml files (ones which have a *.mli). +pushd $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 +for f in *.ml; do \ + b=`basename $f .ml`; \ + if [ -f "$b.mli" ]; then \ + rm $f; \ + fi; \ +done +popd + +# Remove .cvsignore files from examples directory. +find examples -name .cvsignore -exec rm {} \; + %clean rm -rf $RPM_BUILD_ROOT @@ -85,19 +112,46 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_bindir}/* -%{_libdir}/ocaml/lablgtk2 -%{_libdir}/ocaml/stublibs/* %doc README COPYING CHANGES -%doc examples +%dir %{_libdir}/ocaml/lablgtk2 +%{_libdir}/ocaml/lablgtk2/*.cmi +%{_libdir}/ocaml/lablgtk2/*.cma +%{_libdir}/ocaml/stublibs/*.so +%{_bindir}/gdk-pixbuf-mlsource +%{_bindir}/lablgladecc2 +%{_bindir}/lablgtk2 + + +%files devel +%defattr(-,root,root,-) +%doc README COPYING CHANGES +%dir %{_libdir}/ocaml/lablgtk2 +%{_libdir}/ocaml/lablgtk2/META +%{_libdir}/ocaml/lablgtk2/*.a +%{_libdir}/ocaml/lablgtk2/*.cmxa +%{_libdir}/ocaml/lablgtk2/*.cmx +%{_libdir}/ocaml/lablgtk2/*.mli +%{_libdir}/ocaml/lablgtk2/*.ml +%{_libdir}/ocaml/lablgtk2/*.h +%{_libdir}/ocaml/lablgtk2/gtkInit.cmo +%{_libdir}/ocaml/lablgtk2/gtkInit.o +%{_libdir}/ocaml/lablgtk2/gtkThInit.cmo +%{_libdir}/ocaml/lablgtk2/gtkThread.cmo +%{_libdir}/ocaml/lablgtk2/gtkThread.o +%{_libdir}/ocaml/lablgtk2/propcc +%{_libdir}/ocaml/lablgtk2/varcc %files doc %defattr(-,root,root,-) -%doc doc/html +%doc examples doc/html %changelog +* Sat Jul 7 2007 Gerard Milmeister - 2.6.0-8.20060908cvs +- update to cvs version +- renamed package from lablgtk to ocaml-lablgtk + * Sat Dec 2 2006 Gerard Milmeister - 2.6.0-7 - Rebuild for ocaml 3.09.3 diff --git a/sources b/sources index e4e3f01..7673dc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47319aacbbb761323bdfab67513829df lablgtk-2.6.0.tar.gz +5fd6a55c7207d5eb9031e0017b117d6b lablgtk2-20060908.tar.gz