rpms/lablgtk/FC-4 .cvsignore, 1.3, 1.4 lablgtk.spec, 1.10, 1.11 sources, 1.3, 1.4

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/lablgtk/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26294

Modified Files:
	.cvsignore lablgtk.spec sources 
Log Message:
new version 2.6.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	11 Feb 2005 23:55:06 -0000	1.3
+++ .cvsignore	31 Dec 2005 23:40:30 -0000	1.4
@@ -1 +1 @@
-lablgtk-2.4.0.tar.gz
+lablgtk-2.6.0.tar.gz


Index: lablgtk.spec
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/lablgtk.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- lablgtk.spec	10 Sep 2005 19:26:29 -0000	1.10
+++ lablgtk.spec	31 Dec 2005 23:40:30 -0000	1.11
@@ -1,26 +1,34 @@
 Name:           lablgtk
-Version:        2.4.0
-Release:	6%{?dist}
+Version:        2.6.0
+Release:        1%{?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.4.0.tar.gz
-Patch0:		lablgtk-gcc4.patch
+Source:         http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-2.6.0.tar.gz
+#Patch0:        lablgtk-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ocaml >= 3.08
-%{?_with_gl:Requires: lablgl >= 1.00}
+
 BuildRequires:  ocaml >= 3.08, camlp4 >= 3.08
 # lablgtk can generate quite extensive documentation.
 # Probably should enable this and create a subpackage for it.
-#BuildRequires:  ocaml-ocamldoc
-%{?_with_gl:BuildRequires: lablgl >= 1.00, gtkglarea2-devel}
+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, libgnomecanvas-devel, gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  gnome-panel-devel
+BuildRequires:  gtkspell-devel
+
+Requires:       ocaml >= 3.08
+Requires:       lablgl >= 1.02
+
 
 %description
 LablGTK is is an Objective Caml interface to gtk+.
@@ -30,16 +38,29 @@
 is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
+
+%package doc
+Group:          System Environment/Libraries
+Summary:        Documentation for LablGTK
+Requires:	lablgtk = %{version}-%{release}
+
+%description doc
+Documentation for LablGTK.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
+#%patch0 -p1 -b .gcc4
 # version information in META file is wrong
-perl -pi -e 's|version="1.3.1"|version="2.4.0"|' META
+perl -pi -e 's|version="1.3.1"|version="2.6.0"|' META
+
 
 %build
-%configure %{?_with_gl: --with-gl} %{!?_with_gl: --without-gl} --enable-debug
+%configure --with-gl --enable-debug
 perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
 make world
+make doc
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -54,22 +75,35 @@
      DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
 cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
+
 %postun -p /sbin/ldconfig
 
+
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/stublibs/*
 %doc README COPYING CHANGES
 %doc examples
 
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/html
+
+
 %changelog
+* Sun Jan  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.6.0-1
+- new version 2.6.0
+
 * Sat Sep 10 2005 Gerard Milmeister <gemi at bluewin.ch> - 2.4.0-6
 - include META file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lablgtk/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	11 Feb 2005 23:55:06 -0000	1.3
+++ sources	31 Dec 2005 23:40:30 -0000	1.4
@@ -1 +1 @@
-faa7b28c3ad97a1a76d983d24f26f567  lablgtk-2.4.0.tar.gz
+47319aacbbb761323bdfab67513829df  lablgtk-2.6.0.tar.gz