Update of /cvsroot/monetdb/clients
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19182
Modified Files:
MonetDB-client.spec.in
Log Message:
Put mclient.py in the python subpackage and don't install mclient.pyc
and mclient.pyo.
Fixed the test for fedora >= 7.
Index: MonetDB-client.spec.in
===================================================================
RCS file: /cvsroot/monetdb/clients/MonetDB-client.spec.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- MonetDB-client.spec.in 5 Sep 2007 17:05:50 -0000 1.23
+++ MonetDB-client.spec.in 7 Sep 2007 13:13:06 -0000 1.24
@@ -64,12 +64,9 @@
%endif
%if %{?_with_perl:1}%{!?_with_perl:0}
Requires: perl, swig
-%if %{?fc7:1}%{!?fc7:0}
+%if 0%{?fedora} >= 7
# in Fedora Core 6 there is no perl-devel package: everything is in perl;
-# in Fedora 7 there is a perl-devel package which we need. Presumably this
-# test needs refinement for Fedora > 7. We may be able to check for the
-# existence of the variable "fedora" since it seems to be present in F7 but
-# not in FC6.
+# in Fedora 7 there is a perl-devel package which we need.
Requires: perl-devel
%endif
%endif
@@ -116,12 +113,9 @@
%define perl_libdir %(perl -MConfig -e '$x=$Config{installvendorarch}; $x =~
s|$Config{vendorprefix}/||; print $x;')
%if !%{?buildsystem}
BuildRequires: perl, swig
-%if %{?fc7:1}%{!?fc7:0}
+%if 0%{?fedora} >= 7
# in Fedora Core 6 there is no perl-devel package: everything is in perl;
-# in Fedora 7 there is a perl-devel package which we need. Presumably this
-# test needs refinement for Fedora > 7. We may be able to check for the
-# existence of the variable "fedora" since it seems to be present in F7 but
-# not in FC6.
+# in Fedora 7 there is a perl-devel package which we need.
BuildRequires: perl-devel
%endif
%endif
@@ -248,7 +242,7 @@
%files
%defattr(-,root,root)
-%{_bindir}/mclient*
+%{_bindir}/mclient
%{_bindir}/msqldump
%{_libdir}/libMapi.so.*
@@ -283,6 +277,9 @@
%if %{?_with_python:1}%{!?_with_python:0}
%files python
%defattr(-,root,root)
+%{_bindir}/mclient.py
+%exclude %{_bindir}/mclient.pyc
+%exclude %{_bindir}/mclient.pyo
%{_prefix}/%{python_libdir}/*
%dir %{_datadir}/MonetDB/python
%{_datadir}/MonetDB/python/Mapi.py*
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
