Author: arekm Date: Fri Jan 8 09:35:59 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; use gentoo layout which avoids conflicts with unixODBC
---- Files affected: packages/libiodbc: libiodbc.spec (1.37 -> 1.38) ---- Diffs: ================================================================ Index: packages/libiodbc/libiodbc.spec diff -u packages/libiodbc/libiodbc.spec:1.37 packages/libiodbc/libiodbc.spec:1.38 --- packages/libiodbc/libiodbc.spec:1.37 Fri Jan 8 10:14:09 2010 +++ packages/libiodbc/libiodbc.spec Fri Jan 8 10:35:54 2010 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): Zarządca sterowników iODBC Name: libiodbc Version: 3.52.7 -Release: 2 +Release: 3 License: LGPL v2 or BSD Group: Libraries Source0: http://www.iodbc.org/downloads/iODBC/%{name}-%{version}.tar.gz @@ -20,7 +20,6 @@ BuildRequires: gtk+2-devel >= 1:2.0.0 BuildRequires: libtool BuildRequires: pkgconfig -Conflicts: unixODBC BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -46,7 +45,6 @@ Summary(pl.UTF-8): Pliki nagłówkowe do rozwoju aplikacji na iODBC Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Conflicts: unixODBC-devel %description devel The iODBC Driver Manager is a free implementation of the SAG CLI and @@ -71,7 +69,6 @@ Summary(pl.UTF-8): Statyczna wersja bibliotek iODBC Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Conflicts: unixODBC-static %description static Static version of iODBC libraries. @@ -103,18 +100,19 @@ %{__autoheader} %{__autoconf} %configure \ + --with-layout=gentoo %{!?with_gtk:--disable-gui} %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{_sysconfdir} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/iodbc %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -install etc/odbc.ini.sample $RPM_BUILD_ROOT%{_sysconfdir}/odbc.ini +install etc/odbc.ini.sample $RPM_BUILD_ROOT%{_sysconfdir}/iodbc/odbc.ini rm -rf $RPM_BUILD_ROOT/usr/share/libiodbc/samples/ # dlopened by lib*.so @@ -134,7 +132,8 @@ %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog LICENSE LICENSE.BSD NEWS README -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/odbc.ini +%dir %{_sysconfdir}/iodbc +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/iodbc/odbc.ini %attr(755,root,root) %{_bindir}/iodbctest %attr(755,root,root) %{_bindir}/iodbctestw %attr(755,root,root) %{_libdir}/libiodbc.so.2.*.* @@ -151,7 +150,7 @@ %attr(755,root,root) %{_libdir}/libiodbcinst.so %{_libdir}/libiodbc.la %{_libdir}/libiodbcinst.la -%{_includedir}/*.h +%{_includedir}/iodbc %{_pkgconfigdir}/libiodbc.pc %{_mandir}/man1/iodbc-config.1* @@ -179,6 +178,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2010/01/08 09:35:54 arekm +- rel 3; use gentoo layout which avoids conflicts with unixODBC + Revision 1.37 2010/01/08 09:14:09 arekm - rel 2; conflicts with unixodbc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libiodbc/libiodbc.spec?r1=1.37&r2=1.38&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit