Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24198

Modified Files:
      Tag: SQL_2-18
        MonetDB-SQL.spec.in 
Log Message:
Remove file MonetDB-SQL.pc since it is not packaged.
Package Mbeddedsql5 and libembeddedsql5.* into server5 RPM instead of
server4 RPM.
Some very minor changes to make this version look more like the
Current version.


Index: MonetDB-SQL.spec.in
===================================================================
RCS file: /cvsroot/monetdb/sql/MonetDB-SQL.spec.in,v
retrieving revision 1.39.2.5
retrieving revision 1.39.2.6
diff -u -d -r1.39.2.5 -r1.39.2.6
--- MonetDB-SQL.spec.in 26 Jul 2007 14:26:18 -0000      1.39.2.5
+++ MonetDB-SQL.spec.in 31 Jul 2007 10:45:37 -0000      1.39.2.6
@@ -49,6 +49,7 @@
 
 %description server4
 Add the MonetDB4 SQL server module description here
+
 %endif
 
 %if %{?_with_monetdb5:1}%{!?_with_monetdb5:0}
@@ -62,6 +63,7 @@
 
 %description server5
 Add the MonetDB5 SQL server module description here
+
 %endif
 
 # %package devel
@@ -113,8 +115,9 @@
 #find $RPM_BUILD_ROOT -name .incs.in | xargs rm
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/MonetDB4/Tests/*
-rm -rf $RPM_BUILD_ROOT%{_libdir}/python*
+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
 
 # Fixes monet config script
 #perl -p -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{prefix}/bin/monet_config
@@ -131,9 +134,7 @@
 %files server4
 %defattr(-,root,root) 
 %{prefix}/bin/Mbeddedsql
-%{prefix}/bin/Mbeddedsql5
 %{_libdir}/libembeddedsql.*
-%{_libdir}/libembeddedsql5.*
 %{_libdir}/MonetDB4/lib/lib_sql_server*
 %{_libdir}/MonetDB4/*.mil
 %{prefix}/include/embeddedclient.h
@@ -144,6 +145,8 @@
 %defattr(-,root,root) 
 #%{prefix}/bin/Mbeddedsql
 #%{_libdir}/libembeddedsql.*
+%{prefix}/bin/Mbeddedsql5
+%{_libdir}/libembeddedsql5.*
 %{_libdir}/MonetDB5/lib/lib_sql*
 %{_libdir}/MonetDB5/*.mal
 %endif


-------------------------------------------------------------------------
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

Reply via email to