diff --git a/.cvsignore b/.cvsignore index d60ee15..beaca3b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -q-7.6.tar.gz +q-7.8.tar.gz diff --git a/q.spec b/q.spec index 4a7441e..1c6d785 100644 --- a/q.spec +++ b/q.spec @@ -1,12 +1,11 @@ Name: q -Version: 7.6 -Release: 2%{?dist} +Version: 7.8 +Release: 1%{?dist} Summary: Equational programming language Group: Development/Languages -License: GPL -Source: http://switch.dl.sourceforge.net/sourceforge/q-lang/q-7.6.tar.gz -Patch0: q-7.5-curlopt.patch +License: GPLv2+ +Source: http://ovh.dl.sourceforge.net/sourceforge/q-lang/q-7.8.tar.gz URL: http://q-lang.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ImageMagick-devel @@ -52,21 +51,23 @@ 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 -%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. +# %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. %prep %setup -q -%patch0 -p1 -sed -i 's|/usr/sbin/apxs2|/usr/sbin/apxs -I../src -L../src|' mod_q/Makefile +# # 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 @@ -86,9 +87,10 @@ chmod +x %{__find_provides} %configure --with-unicode --with-rl="-lreadline -lncurses" # %{?_smp_mflags} breaks the build make -cd mod_q -make -gcc -shared .libs/mod_q.o -lqint -L../src/.libs -lpthread -Wl,-soname -Wl,mod_q.so -o .libs/mod_q.so +# # 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 @@ -106,9 +108,9 @@ 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 +# 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 @@ -145,17 +147,19 @@ fi %{_includedir}/* %{_libdir}/lib*.so %{_bindir}/qcc -%{_bindir}/qcwrap %{_bindir}/qld - -%files -n mod_q -%defattr(-,root,root,-) -%doc mod_q/README mod_q/myreq.q -%{_libdir}/httpd/modules/mod_q.so +# # mod_q +# %files -n mod_q +# %defattr(-,root,root,-) +# %doc mod_q/README mod_q/myreq.q +# %{_libdir}/httpd/modules/mod_q.so %changelog +* Wed Oct 24 2007 Gerard Milmeister - 7.8-1 +- new version 7.8 + * Thu Feb 15 2007 Gerard Milmeister - 7.6-2 - use ncurses instead of termcap diff --git a/sources b/sources index c1251ab..ef40efa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f5f68f8f966376ea047a016354fc8bfe q-7.6.tar.gz +9e95a2586cb011f7004217d78ff7d3d9 q-7.8.tar.gz