SPECS: gtk2hs.spec - rel 1 - added SVG (svg-cairo) bindings - merg...

baggins baggins at pld-linux.org
Tue Sep 11 15:34:06 CEST 2007


Author: baggins                      Date: Tue Sep 11 13:34:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 1
- added SVG (svg-cairo) bindings
- merged glib and cairo packages into main
- fixed building with current glib/gtk+

---- Files affected:
SPECS:
   gtk2hs.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/gtk2hs.spec
diff -u SPECS/gtk2hs.spec:1.6 SPECS/gtk2hs.spec:1.7
--- SPECS/gtk2hs.spec:1.6	Tue Sep  4 14:00:51 2007
+++ SPECS/gtk2hs.spec	Tue Sep 11 15:34:01 2007
@@ -11,12 +11,13 @@
 Summary(pl.UTF-8):	Biblioteka GUI dla Haskella oparta na GTK+
 Name:		gtk2hs
 Version:	0.9.12
-Release:	0.1
+Release:	1
 License:	LGPL
 Group:		Development/Libraries
 #Group:		Development/Languages/Haskell
 Source0:	http://downloads.sourceforge.net/gtk2hs/%{name}-%{version}.tar.gz
 # Source0-md5:	32752a42c225f55b0280151f8e19a3ed
+Patch0:		%{name}-CUInt.patch
 URL:		http://haskell.org/gtk2hs/
 BuildRequires:	GConf2-devel
 BuildRequires:	cairo-devel >= 1.0.0
@@ -28,12 +29,15 @@
 %{?with_doc:BuildRequires:	haddock}
 BuildRequires:	libglade2-devel
 BuildRequires:	librsvg-devel >= 1:2.16.0
+BuildRequires:	libsvg-cairo-devel >= 0.1.6
 BuildRequires:	xulrunner-devel
 Requires(post,preun):	%{_bindir}/ghc-pkg
 %requires_eq	ghc
+Requires:	cairo-devel >= 1.0.0
+Requires:	glib2-devel
 Requires:	gtk+2-devel
-Requires:	gtk2hs-cairo = %{version}-%{release}
-Requires:	gtk2hs-glib = %{version}-%{release}
+Obsoletes:	gtk2hs-cairo
+Obsoletes:	gtk2hs-glib
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -48,20 +52,22 @@
 do wersji GTK+ 2.2, a także częścią widgetów 2.4, takich jak nowe okno
 dialogowe wyboru plików.
 
-%package cairo
-Summary:	Haskell cairo binding for gtk2hs
-Summary(pl.UTF-8):	Dowiązanie cairo do Haskella dla gtk2hs
+%package svgcairo
+Summary:	Haskell SVG cairo binding for gtk2hs
+Summary(pl.UTF-8):	Dowiązanie SVG cairo do Haskella dla gtk2hs
 Group:		Development/Libraries
 #Group:		Development/Languages/Haskell
 Requires(post,preun):	%{_bindir}/ghc-pkg
-Requires:	cairo-devel >= 1.0.0
+Requires:	librsvg-devel >= 1:2.16.0
+Requires:	libsvg-cairo-devel >= 0.1.6
+Requires:	%{name} = %{version}-%{release}
 %requires_eq	ghc
 
-%description cairo
-Haskell cairo binding for gtk2hs.
+%description svgcairo
+Haskell SVG cairo binding for gtk2hs.
 
-%description cairo -l pl.UTF-8
-Dowiązanie cairo do Haskella dla gtk2hs.
+%description svgcairo -l pl.UTF-8
+Dowiązanie SVG cairo do Haskella dla gtk2hs.
 
 %package gconf
 Summary:	Haskell GConf binding for gtk2hs
@@ -70,8 +76,8 @@
 #Group:		Development/Languages/Haskell
 Requires(post,preun):	%{_bindir}/ghc-pkg
 Requires:	GConf2-devel
+Requires:	%{name} = %{version}-%{release}
 %requires_eq	ghc
-Requires:	gtk2hs-glib = %{version}-%{release}
 
 %description gconf
 Haskell GConf binding for gtk2hs.
@@ -85,9 +91,9 @@
 Group:		Development/Libraries
 #Group:		Development/Languages/Haskell
 Requires(post,preun):	%{_bindir}/ghc-pkg
-%requires_eq	ghc
 Requires:	libglade2-devel
-Requires:	gtk2hs = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
+%requires_eq	ghc
 
 %description glade
 Haskell Glade2 binding for gtk2hs.
@@ -95,30 +101,15 @@
 %description glade -l pl.UTF-8
 Dowiązanie Glade2 do Haskella dla gtk2hs.
 
-%package glib
-Summary:	Haskell glib binding for gtk2hs
-Summary(pl.UTF-8):	Dowiązanie gliba do Haskella dla gtk2hs
-Group:		Development/Libraries
-#Group:		Development/Languages/Haskell
-Requires(post,preun):	%{_bindir}/ghc-pkg
-%requires_eq	ghc
-Requires:	glib2-devel
-
-%description glib
-Haskell glib binding for gtk2hs.
-
-%description glib -l pl.UTF-8
-Dowiązanie gliba do Haskella dla gtk2hs.
-
 %package mozembed
 Summary:	Haskell gtkembedmoz binding for gtk2hs
 Summary(pl.UTF-8):	Dowiązanie gtkembedmoz do Haskella dla gtk2hs
 Group:		Development/Libraries
 #Group:		Development/Languages/Haskell
 Requires(post,preun):	%{_bindir}/ghc-pkg
-%requires_eq	ghc
-Requires:	gtk2hs = %{version}-%{release}
 Requires:	xulrunner-devel
+Requires:	%{name} = %{version}-%{release}
+%requires_eq	ghc
 
 %description mozembed
 Haskell GtkEmbedMoz binding for gtk2hs.
@@ -132,9 +123,9 @@
 Group:		Development/Libraries
 #Group:		Development/Languages/Haskell
 Requires(post,preun):	%{_bindir}/ghc-pkg
-%requires_eq	ghc
-Requires:	gtk2hs = %{version}-%{release}
 Requires:	gtksourceview-devel
+Requires:	%{name} = %{version}-%{release}
+%requires_eq	ghc
 
 %description sourceview
 Haskell GtkSourceView binding for gtk2hs.
@@ -148,9 +139,9 @@
 Group:		Development/Libraries
 #Group:		Development/Languages/Haskell
 Requires(post,preun):	%{_bindir}/ghc-pkg
-%requires_eq	ghc
-Requires:	gtk2hs = %{version}-%{release}
 Requires:	gtkglext-devel >= 1.0.5
+Requires:	%{name} = %{version}-%{release}
+%requires_eq	ghc
 
 %description gtkglext
 Haskell GtkGLExt binding for gtk2hs.
@@ -160,6 +151,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -191,6 +183,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
+ghc-pkg register %{ghclibdir}/gtk2hs/glib.package.conf
+ghc-pkg register %{ghclibdir}/gtk2hs/cairo.package.conf
 ghc-pkg register %{ghclibdir}/gtk2hs/gtk.package.conf
 ghc-pkg register %{ghclibdir}/gtk2hs/soegtk.package.conf
 
@@ -198,14 +192,16 @@
 if [ "$1" = 0 ]; then
   ghc-pkg unregister soegtk
   ghc-pkg unregister gtk
+  ghc-pkg unregister cairo
+  ghc-pkg unregister glib
 fi
 
-%post cairo
-ghc-pkg register %{ghclibdir}/gtk2hs/cairo.package.conf
+%post svgcairo
+ghc-pkg register %{ghclibdir}/gtk2hs/svgcairo.package.conf
 
-%preun cairo
+%preun svgcairo
 if [ "$1" = 0 ]; then
-  ghc-pkg unregister cairo
+  ghc-pkg unregister svgcairo
 fi
 
 %post gconf
@@ -224,14 +220,6 @@
   ghc-pkg unregister glade
 fi
 
-%post glib
-ghc-pkg register %{ghclibdir}/gtk2hs/glib.package.conf
-
-%preun glib
-if [ "$1" = 0 ]; then
-  ghc-pkg unregister glib
-fi
-
 %post mozembed
 ghc-pkg register %{ghclibdir}/gtk2hs/mozembed.package.conf
 
@@ -260,23 +248,36 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog TODO
 %{?with_doc:%doc docs/reference}
+%dir %{ghclibdir}/gtk2hs
+%dir %{ghclibdir}/gtk2hs/imports
+%dir %{ghclibdir}/gtk2hs/include
+%{ghclibdir}/gtk2hs/include/gtk2hs-config.h
 %{ghclibdir}/gtk2hs/gtk.package.conf
 %{ghclibdir}/gtk2hs/soegtk.package.conf
 %{ghclibdir}/gtk2hs/HSgtk.o
 %{ghclibdir}/gtk2hs/HSsoegtk.o
 %{ghclibdir}/gtk2hs/libHSgtk.a
 %{ghclibdir}/gtk2hs/libHSsoegtk.a
-%{ghclibdir}/gtk2hs/include/gtk2hs-config.h
 %{ghclibdir}/gtk2hs/imports/gtk
 %{ghclibdir}/gtk2hs/imports/soegtk
 
-%files cairo
-%defattr(644,root,root,755)
 %{ghclibdir}/gtk2hs/cairo.package.conf
 %{ghclibdir}/gtk2hs/HScairo.o
 %{ghclibdir}/gtk2hs/libHScairo.a
 %{ghclibdir}/gtk2hs/imports/cairo
 
+%{ghclibdir}/gtk2hs/glib.package.conf
+%{ghclibdir}/gtk2hs/HSglib.o
+%{ghclibdir}/gtk2hs/libHSglib.a
+%{ghclibdir}/gtk2hs/imports/glib
+
+%files svgcairo
+%defattr(644,root,root,755)
+%{ghclibdir}/gtk2hs/svgcairo.package.conf
+%{ghclibdir}/gtk2hs/HSsvgcairo.o
+%{ghclibdir}/gtk2hs/libHSsvgcairo.a
+%{ghclibdir}/gtk2hs/imports/svgcairo
+
 %files gconf
 %defattr(644,root,root,755)
 %{ghclibdir}/gtk2hs/gconf.package.conf
@@ -291,15 +292,6 @@
 %{ghclibdir}/gtk2hs/libHSglade.a
 %{ghclibdir}/gtk2hs/imports/glade
 
-%files glib
-%defattr(644,root,root,755)
-%dir %{ghclibdir}/gtk2hs
-%dir %{ghclibdir}/gtk2hs/imports
-%{ghclibdir}/gtk2hs/glib.package.conf
-%{ghclibdir}/gtk2hs/HSglib.o
-%{ghclibdir}/gtk2hs/libHSglib.a
-%{ghclibdir}/gtk2hs/imports/glib
-
 %files mozembed
 %defattr(644,root,root,755)
 %{ghclibdir}/gtk2hs/mozembed.package.conf
@@ -327,6 +319,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2007/09/11 13:34:01  baggins
+- rel 1
+- added SVG (svg-cairo) bindings
+- merged glib and cairo packages into main
+- fixed building with current glib/gtk+
+
 Revision 1.6  2007/09/04 12:00:51  baggins
 - updated md5sum
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gtk2hs.spec?r1=1.6&r2=1.7&f=u



More information about the pld-cvs-commit mailing list