From 570bb81255f504d35e448e7af1bab00ec8c82730 Mon Sep 17 00:00:00 2001
From: Gérard Milmeister <gemi@fedoraproject.org>
Date: Aug 05 2008 14:22:09 +0000
Subject: *** empty log message ***


---

diff --git a/q.spec b/q.spec
index 4e69314..eb3b77c 100644
--- a/q.spec
+++ b/q.spec
@@ -1,21 +1,21 @@
 Name: 		q
-Version: 	7.10
-Release: 	3%{?dist}
+Version: 	7.11
+Release: 	2%{?dist}
 Summary: 	Equational programming language
 
 Group: 		Development/Languages
 License: 	GPLv2+
-Source: 	http://ovh.dl.sourceforge.net/sourceforge/q-lang/q-7.10.tar.gz
+Source: 	http://ovh.dl.sourceforge.net/sourceforge/q-lang/q-%{version}.tar.gz
 URL: 		http://q-lang.sourceforge.net
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ImageMagick-devel
 BuildRequires:	bison
 BuildRequires:	curl-devel
+BuildRequires:  dx-devel
 BuildRequires:	flex
 BuildRequires:	freetype-devel
 BuildRequires:	gdbm-devel
 BuildRequires:	gmp-devel
-BuildRequires:	httpd-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
 BuildRequires:	ncurses-devel
@@ -27,7 +27,7 @@ BuildRequires:	which
 BuildRequires:	zlib-devel
 Requires(post): /sbin/ldconfig /sbin/install-info
 Requires(postun): /sbin/ldconfig /sbin/install-info
-ExcludeArch:	x86_64
+#ExcludeArch:	x86_64
 
 
 %description
@@ -41,6 +41,42 @@ a standard library, add-on modules for interfacing to Curl, GNU dbm,
 ODBC, GNU Octave, ImageMagick, Tcl/Tk, XML/XSLT and an Emacs mode.
 
 
+%package dx
+Summary:        DX module for Q
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+
+%description dx
+%{summary}.
+
+
+%package curl
+Summary:        cURL module for Q
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+
+%description curl
+%{summary}.
+
+
+%package magick
+Summary:        ImageMagick module for Q
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+
+%description magick
+%{summary}.
+
+
+%package tk
+Summary:        Tk module for Q
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
+
+%description tk
+%{summary}.
+
+
 %package devel
 Summary:        Headers and static library for developing programs using Q
 Group:		Development/Libraries
@@ -49,25 +85,11 @@ Requires:	libtool
 
 
 %description devel
-Headers and static library for developing programs using Q.
-
-# # mod_q
-# %package -n mod_q
-# Summary:	An embedded Q interpreter for the Apache Web server
-# Group:		System Environment/Daemons
-# Requires:	httpd >= 2.0.40
-
-# %description -n mod_q
-# Mod_q is a module that embeds the Q language interpreter within
-# the server, allowing Apache handlers to be written in Q.
+%{summary}.
 
 
 %prep
 %setup -q
-# # mod_q
-# %setup -q -D -T -a 1
-# sed -i 's|apxs2|apxs|' mod_q-1.1/Makefile
-
 sed -i 's|@libtool@|libtool|' src/Makefile.in
 
 %define _use_internal_dependency_generator 0
@@ -84,13 +106,9 @@ chmod +x %{__find_provides}
 
 
 %build
-%configure --with-unicode --with-rl="-lreadline -lncurses"
+%configure --with-unicode --with-rl="-lreadline -lncurses" --with-dxl="-lDX -lDXL" --with-magick="`pkg-config ImageMagick --libs`" --with-magick-includes="`pkg-config ImageMagick --cflags`"
 # %{?_smp_mflags} breaks the build
 make
-# # mod_Q
-# cd mod_q-1.1
-# make
-# gcc -shared .libs/mod_q.o -lqint -L../src/.libs -lpthread  -Wl,-soname -Wl,mod_q.so -o .libs/mod_q.so
 
 
 %install
@@ -105,13 +123,6 @@ mkdir -p $RPM_BUILD_ROOT%{_docdir}/q-%{version}
 mv $RPM_BUILD_ROOT%{_datadir}/q/etc $RPM_BUILD_ROOT%{_docdir}/q-%{version}
 mv $RPM_BUILD_ROOT%{_datadir}/q/examples $RPM_BUILD_ROOT%{_docdir}/q-%{version}
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/gqbuilder
-rm -fr $RPM_BUILD_ROOT%{_datadir}/q/gqbuilder
-
-# mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules
-# install -m 0755 mod_q/.libs/mod_q.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules
-# chmod 0644 mod_q/myreq.q
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -140,6 +151,14 @@ fi
 %{_datadir}/q
 %{_docdir}/q-%{version}
 %docdir %{_docdir}/q-%{version}/
+%exclude %{_libdir}/q/dxl.so
+%exclude %{_datadir}/q/lib/dxl.q
+%exclude %{_libdir}/q/curl.so
+%exclude %{_datadir}/q/lib/curl.q
+%exclude %{_libdir}/q/magick.so
+%exclude %{_datadir}/q/lib/magick.q
+%exclude %{_libdir}/q/tk.so
+%exclude %{_datadir}/q/lib/tk.q
 
 
 %files devel
@@ -149,14 +168,35 @@ fi
 %{_bindir}/qcc
 %{_bindir}/qld
 
-# # mod_q
-# %files -n mod_q
-# %defattr(-,root,root,-)
-# %doc mod_q/README mod_q/myreq.q
-# %{_libdir}/httpd/modules/mod_q.so
+
+%files dx
+%defattr(-,root,root,-)
+%{_libdir}/q/dxl.so
+%{_datadir}/q/lib/dxl.q
+
+
+%files curl
+%defattr(-,root,root,-)
+%{_libdir}/q/curl.so
+%{_datadir}/q/lib/curl.q
+
+%files magick
+%defattr(-,root,root,-)
+%{_libdir}/q/magick.so
+%{_datadir}/q/lib/magick.q
+
+
+%files tk
+%defattr(-,root,root,-)
+%{_libdir}/q/tk.so
+%{_datadir}/q/lib/tk.q
 
 
 %changelog
+* Tue Aug  5 2008 Gerard Milmeister <gemi@bluewin.ch> - 7.11-2
+- new release 7.11
+- split some modules into separate packages
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 7.10-3
 - Autorebuild for GCC 4.3