Author: baggins                      Date: Sat Nov 21 21:51:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.9

---- Files affected:
packages/mysql++:
   mysql++-nolibs.patch (1.1 -> 1.2) , mysql++.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/mysql++/mysql++-nolibs.patch
diff -u packages/mysql++/mysql++-nolibs.patch:1.1 
packages/mysql++/mysql++-nolibs.patch:1.2
--- packages/mysql++/mysql++-nolibs.patch:1.1   Fri Apr  2 00:55:07 2004
+++ packages/mysql++/mysql++-nolibs.patch       Sat Nov 21 22:51:47 2009
@@ -1,12 +1,14 @@
---- mysql++-1.7.9/configure.in.orig    2001-05-19 18:44:46.000000000 +0200
-+++ mysql++-1.7.9/configure.in 2004-04-02 00:04:39.972332000 +0200
-@@ -97,9 +97,6 @@
- AC_PROG_CC
- AC_PROG_CXX
+--- mysql++-3.0.9/configure.in.orig    2009-11-21 22:26:54.033831728 +0100
++++ mysql++-3.0.9/configure.ac 2009-11-21 22:26:59.248648480 +0100
+@@ -55,11 +55,9 @@
  
+ # Checks for libraries and local system features
+ LIB_MATH
+-LIB_SOCKET_NSL
+ MYSQL_API_LOCATION
+ MYSQL_WITH_SSL
+ AX_C_LOCALTIME_R
 -AC_CHECK_LIB(intl, main)
--AC_CHECK_LIB(socket, main)
--AC_CHECK_LIB(nsl, main)
- AC_CHECK_LIB(mysqlclient, mysql_store_result)
- AM_WITH_DMALLOC()
  
+ 
+ # If this is Cygwin, add a linker flag to suppress a silly link message.

================================================================
Index: packages/mysql++/mysql++.spec
diff -u packages/mysql++/mysql++.spec:1.23 packages/mysql++/mysql++.spec:1.24
--- packages/mysql++/mysql++.spec:1.23  Tue Feb 13 08:16:49 2007
+++ packages/mysql++/mysql++.spec       Sat Nov 21 22:51:47 2009
@@ -2,17 +2,16 @@
 Summary:       C++ interface to MySQL Database
 Summary(pl.UTF-8):     Interfejs C++ do bazy MySQL
 Name:          mysql++
-Version:       1.7.26
-Release:       4
+Version:       3.0.9
+Release:       1
 License:       LGPL
 Group:         Libraries
 Source0:       
http://tangentsoft.net/mysql++/releases/%{name}-%{version}.tar.gz
-# Source0-md5: 2e425b1a334523723aadd86c9a3185bc
-Patch1:                %{name}-nolibs.patch
-Patch2:                %{name}-libpath.patch
+# Source0-md5: 4acc1603846fe67d36b6243bfb805652
+Patch0:                %{name}-nolibs.patch
 URL:           http://tangentsoft.net/mysql++/
 BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: bakefile
 BuildRequires: libstdc++-devel
 BuildRequires: libtool
 BuildRequires: mysql-devel
@@ -57,17 +56,15 @@
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
 %{__autoconf}
-%{__automake}
 %configure \
-       --with-mysql-lib=%{_libdir}
-%{__make}
+       --enable-static
+
+%{__make} \
+       CXXFLAGS="%{rpmcxxflags} -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,17 +81,17 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/lib*.so.3
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*
 %attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
 %{_includedir}/*
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+#%files static
+#%defattr(644,root,root,755)
+#%{_libdir}/lib*.a
 
 %define        date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -102,6 +99,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2009/11/21 21:51:47  baggins
+- up to 3.0.9
+
 Revision 1.23  2007/02/13 07:16:49  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql++/mysql++-nolibs.patch?r1=1.1&r2=1.2&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql++/mysql++.spec?r1=1.23&r2=1.24&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to