rpms/q/devel .cvsignore,1.7,1.8 q.spec,1.12,1.13 sources,1.7,1.8
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Tue Aug 5 14:22:39 UTC 2008
- Previous message (by thread): rpms/isdn4k-utils/devel isdn4k-utils.spec,1.73,1.74
- Next message (by thread): rpms/libsemanage/devel .cvsignore, 1.94, 1.95 libsemanage-rhat.patch, 1.36, 1.37 libsemanage.spec, 1.158, 1.159 sources, 1.96, 1.97
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: gemi
Update of /cvs/pkgs/rpms/q/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1243
Modified Files:
.cvsignore q.spec sources
Log Message:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/q/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 30 Dec 2007 13:52:51 -0000 1.7
+++ .cvsignore 5 Aug 2008 14:22:09 -0000 1.8
@@ -1 +1 @@
-q-7.10.tar.gz
+q-7.11.tar.gz
Index: q.spec
===================================================================
RCS file: /cvs/pkgs/rpms/q/devel/q.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- q.spec 19 Feb 2008 03:47:13 -0000 1.12
+++ q.spec 5 Aug 2008 14:22:09 -0000 1.13
@@ -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: 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 @@
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 @@
%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 @@
%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 @@
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 @@
%{_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 @@
%{_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 at bluewin.ch> - 7.11-2
+- new release 7.11
+- split some modules into separate packages
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 7.10-3
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/q/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 30 Dec 2007 13:52:51 -0000 1.7
+++ sources 5 Aug 2008 14:22:09 -0000 1.8
@@ -1 +1 @@
-178a3813359633ac0a26f5c73770703f q-7.10.tar.gz
+18ca956aad555b54efacc0de5b2d79bd q-7.11.tar.gz
- Previous message (by thread): rpms/isdn4k-utils/devel isdn4k-utils.spec,1.73,1.74
- Next message (by thread): rpms/libsemanage/devel .cvsignore, 1.94, 1.95 libsemanage-rhat.patch, 1.36, 1.37 libsemanage.spec, 1.158, 1.159 sources, 1.96, 1.97
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list