Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17708
Modified Files:
MonetDB-SQL.spec.in rpm.mk.in
Log Message:
Made spec file and source RPM less system dependent.
Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- MonetDB-SQL.spec.in 24 Jul 2007 14:40:37 -0000 1.45
+++ MonetDB-SQL.spec.in 25 Jul 2007 13:43:47 -0000 1.46
@@ -29,14 +29,12 @@
# Contact [EMAIL PROTECTED] for details and/or assistance.
%endif
%if %{?_with_python:1}%{!?_with_python:0}
-Requires: python = @PYTHON_VERSION@
+Requires: python
%if !%{?buildsystem}
-BuildRequires: python, python-devel = @PYTHON_VERSION@, swig
+BuildRequires: python, python-devel, swig
%endif
%endif
-%define comp_cc @CC@
-
# groups of related archs
%define all_x86 i386 i586 i686
@@ -116,7 +114,7 @@
--enable-assert=no \
--enable-optimize \
--enable-bits=%{bits} \
- CC="%{comp_cc}" \
+ %{?comp_cc:CC="%{comp_cc}"} \
--prefix=%{prefix} \
--libdir=%{_libdir} \
--with-monetdb=%{prefix} \
@@ -135,7 +133,7 @@
#find $RPM_BUILD_ROOT -name .incs.in | xargs rm
rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB4/Tests/*
-rm -rf $RPM_BUILD_ROOT%{prefix}/@PYTHON_LIBDIR@
+rm -rf $RPM_BUILD_ROOT%{prefix}/lib*/python*/site-packages
rm -rf $RPM_BUILD_ROOT%{prefix}/include/sql
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/MonetDB-SQL.pc
Index: rpm.mk.in
===================================================================
RCS file: /cvsroot/monetdb/sql/rpm.mk.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- rpm.mk.in 25 Jun 2007 15:37:31 -0000 1.14
+++ rpm.mk.in 25 Jul 2007 13:43:47 -0000 1.15
@@ -46,7 +46,7 @@
echo "#%top_builddirroot %{_topdir}/INSTALL/" >> $(rpmtopdir)/rpmmacros
rpm: MonetDB-SQL.spec $(top_builddir)/$(distdir).tar.gz
$(rpmtopdir)/rpmmacros
- $(RPMBUILD) -ta ${python} ${monetdb4} ${monetdb5} --define="buildsystem
1" --target `uname -m` --rcfile $(rpmtopdir)/rpmrc
$(top_builddir)/$(distdir).tar.gz
+ $(RPMBUILD) -ta ${python} ${monetdb4} ${monetdb5} --define="buildsystem
1" --define="comp_cc @CC@" --target `uname -m` --rcfile $(rpmtopdir)/rpmrc
$(top_builddir)/$(distdir).tar.gz
for i in rpm/SRPMS/[EMAIL PROTECTED]@[EMAIL PROTECTED]@* ; do \
mv "$$i" "`echo "$$i" | sed 's|[EMAIL PROTECTED]@[EMAIL
PROTECTED]@||'`" ; \
done
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
