Author: lkrotowski                   Date: Thu Jul 10 19:16:11 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 3.0.0
- rel 1
- dropped unsupported backends

---- Files affected:
SPECS:
   libsoci.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/libsoci.spec
diff -u SPECS/libsoci.spec:1.7 SPECS/libsoci.spec:1.8
--- SPECS/libsoci.spec:1.7      Mon Feb 12 23:09:10 2007
+++ SPECS/libsoci.spec  Thu Jul 10 21:16:06 2008
@@ -2,26 +2,25 @@
 #
 # Conditional build:
 %bcond_with    oracle          # build Oracle backend
-%bcond_without firebird        # don't build firebird backend
 %bcond_without mysql           # don't build MySQL backend
 %bcond_without postgresql      # don't build PostgreSQL backend
-%bcond_without sqlite3         # don't build sqlite3 backend
 #
 Summary:       The C++ Database Access Library
 Summary(pl.UTF-8):     Biblioteka obsługi baz danych dla C++
 Name:          libsoci
-Version:       2.2.0
-Release:       0.1
+Version:       3.0.0
+Release:       1
 License:       Boost Software License
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/soci/soci-%{version}.tar.bz2
-# Source0-md5: 01c1baa50dff4c193cdb118b1190af51
+Source0:       http://dl.sourceforge.net/soci/soci-%{version}.tar.gz
+# Source0-md5: 1bf7dd244764e53557c1ecc01fdfac96
+Patch0:                %{name}-gcc43.patch
+Patch1:                %{name}-flags.patch
 URL:           http://soci.sourceforge.net/
 BuildRequires: libstdc++-devel
-%{?with_firebird:BuildRequires:        Firebird-devel}
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_postgresql:BuildRequires:      postgresql-devel}
-%{?with_sqlite3:BuildRequires: sqlite3-devel}
+BuildRequires: tcl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -55,32 +54,6 @@
 %description static -l pl.UTF-8
 Statyczna biblioteka soci.
 
-%package firebird
-Summary:       Firebird backend for soci
-Summary(pl.UTF-8):     Backend Firebirda dla soci
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-
-%description firebird
-This package contains library with the Firebird binding for soci.
-
-%description firebird -l pl.UTF-8
-Ten pakiet zawiera bibliotekę do połączenia bazy Firebird z soci.
-
-%package firebird-static
-Summary:       Firebird backend for soci (static version)
-Summary(pl.UTF-8):     Backend Firebirda dla soci (wersja statyczna)
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description firebird-static
-This package contains static library with the Firebird binding for
-soci.
-
-%description firebird-static -l pl.UTF-8
-Ten pakiet zawiera statyczną bibliotekę do połączenia bazy Firebird z
-soci.
-
 %package mysql
 Summary:       MySQL backend for soci
 Summary(pl.UTF-8):     Backend MySQL-a dla soci
@@ -157,50 +130,27 @@
 Ten pakiet zawiera statyczną bibliotekę do połączenia bazy PostgreSQL z
 soci.
 
-%package sqlite3
-Summary:       sqlite3 backend for soci
-Summary(pl.UTF-8):     Backend sqlite3 dla soci
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-
-%description sqlite3
-This package contains library with the sqlite3 binding for soci.
-
-%description sqlite3 -l pl.UTF-8
-Ten pakiet zawiera bibliotekę do połączenia bazy sqlite3 z soci.
-
-%package sqlite3-static
-Summary:       sqlite3 backend for soci (static version)
-Summary(pl.UTF-8):     Backend sqlite3-a dla soci (wersja statyczna)
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description sqlite3-static
-This package contains static library with the sqlite3 binding for
-soci.
-
-%description sqlite3-static -l pl.UTF-8
-Ten pakiet zawiera statyczną bibliotekę do połączenia bazy sqlite3 z
-soci.
-
 %prep
 %setup -q -n soci-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %configure \
-       %{?debug:--enable-debug} \
-       %{?with_firebird:--enable-backend-firebird} \
-       %{?with_mysql:--enable-backend-mysql} \
-       %{?with_oracle:--enable-backend-oracle} \
-       %{?with_postgresql:--enable-backend-postgresql} \
-       %{?with_sqlite3:--enable-backend-sqlite3}
+       --include-prefix=$RPM_BUILD_ROOT%{_includedir}/soci \
+       --lib-prefix=$RPM_BUILD_ROOT%{_libdir} \
+       --postgresql-include=%{_includedir} \
+       --postgresql-lib=%{_libdir} \
+       --mysql-include=%{_includedir}/mysql \
+       --mysql-lib=%{_libdir}
+
+export CXXFLAGS="%{rpmcxxflags}"
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%{__make} install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -208,9 +158,6 @@
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%post  firebird -p /sbin/ldconfig
-%postun        firebird -p /sbin/ldconfig
-
 %post  mysql -p /sbin/ldconfig
 %postun        mysql -p /sbin/ldconfig
 
@@ -220,9 +167,6 @@
 %post  postgresql -p /sbin/ldconfig
 %postun        postgresql -p /sbin/ldconfig
 
-%post  sqlite3 -p /sbin/ldconfig
-%postun        sqlite3 -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc CHANGES LICENSE_1_0.txt README
@@ -231,29 +175,16 @@
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*
-%{_libdir}/libsoci_core*.la
 %{_includedir}/soci
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libsoci_core*.a
 
-%if %{with firebird}
-%files firebird
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsoci_firebird*.so
-%{_libdir}/libsoci_firebird*.la
-
-%files firebird-static
-%defattr(644,root,root,755)
-%{_libdir}/libsoci_firebird*.a
-%endif
-
 %if %{with mysql}
 %files mysql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsoci_mysql*.so
-%{_libdir}/libsoci_mysql*.la
 
 %files mysql-static
 %defattr(644,root,root,755)
@@ -264,7 +195,6 @@
 %files oracle
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsoci_oracle*.so
-%{_libdir}/libsoci_oracle*.la
 
 %files oracle-static
 %defattr(644,root,root,755)
@@ -275,30 +205,23 @@
 %files postgresql
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsoci_postgresql*.so
-%{_libdir}/libsoci_postgresql*.la
 
 %files postgresql-static
 %defattr(644,root,root,755)
 %{_libdir}/libsoci_postgresql*.a
 %endif
 
-%if %{with sqlite3}
-%files sqlite3
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsoci_sqlite3*.so
-%{_libdir}/libsoci_sqlite3*.la
-
-%files sqlite3-static
-%defattr(644,root,root,755)
-%{_libdir}/libsoci_sqlite3*.a
-%endif
-
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[EMAIL PROTECTED]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2008/07/10 19:16:06  lkrotowski
+- up to 3.0.0
+- rel 1
+- dropped unsupported backends
+
 Revision 1.7  2007/02/12 22:09:10  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/libsoci.spec?r1=1.7&r2=1.8&f=u

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

Reply via email to