Author: qboosh Date: Wed Aug 10 15:58:19 2011 GMT Module: packages Tag: HEAD ---- Log message: - added lt patch, restored -static package - made base package invariant wrt. db bconds
---- Files affected: packages/libpreludedb: libpreludedb.spec (1.19 -> 1.20) , libpreludedb-lt.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/libpreludedb/libpreludedb.spec diff -u packages/libpreludedb/libpreludedb.spec:1.19 packages/libpreludedb/libpreludedb.spec:1.20 --- packages/libpreludedb/libpreludedb.spec:1.19 Wed Aug 3 14:30:14 2011 +++ packages/libpreludedb/libpreludedb.spec Wed Aug 10 17:58:14 2011 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO: -# build with --enable-static instead of --disable-static # # Conditional build: %bcond_without perl # don't build perl bindings @@ -21,11 +19,15 @@ Source0: http://www.prelude-ids.com/download/releases/libpreludedb/%{name}-%{version}.tar.gz # Source0-md5: e2b38dfe2efb2008fcb5e2ce51f6638b Patch0: %{name}-mysql-innodb.patch +Patch1: %{name}-lt.patch URL: http://www.prelude-ids.com/ +BuildRequires: autoconf >= 2.59 +BuildRequires: automake BuildRequires: bison BuildRequires: flex BuildRequires: gtk-doc >= 1.0 BuildRequires: libprelude-devel >= %{version} +BuildRequires: libtool %{?with_mysql:BuildRequires: mysql-devel} %{?with_perl:BuildRequires: perl-devel} BuildRequires: pkgconfig @@ -34,7 +36,7 @@ BuildRequires: rpm-perlprov BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.219 -%{?with_sqlite3:BuildRequires: sqlite3-devel} +%{?with_sqlite3:BuildRequires: sqlite3-devel >= 3.0.0} Requires(post): /sbin/ldconfig Requires: %{name}(DB_driver) = %{version}-%{release} Requires: libprelude-libs >= %{version} @@ -59,7 +61,7 @@ Summary(pl.UTF-8): Pliki nagłówkowe i dokumentacja programistyczna do libpreludedb Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libprelude-devel >= 0.9.9 +Requires: libprelude-devel >= %{version} %description devel Header files and development documentation for libpreludedb. @@ -67,17 +69,17 @@ %description devel -l pl.UTF-8 Pliki nagłówkowe i dokumentacja programistyczna do libpreludedb. -#%package static -#Summary: Static libpreludedb library -#Summary(pl.UTF-8): Statyczna biblioteka libpreludedb -#Group: Development/Libraries -#Requires: %{name}-devel = %{version}-%{release} +%package static +Summary: Static libpreludedb library +Summary(pl.UTF-8): Statyczna biblioteka libpreludedb +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} -#%description static -#Static libpreludedb library. +%description static +Static libpreludedb library. -#%description static -l pl.UTF-8 -#Statyczna biblioteka libpreludedb. +%description static -l pl.UTF-8 +Statyczna biblioteka libpreludedb. %package pgsql Summary: PostgreSQL backend for libpreludedb @@ -145,11 +147,17 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build +%{__libtoolize} +%{__aclocal} -I m4 -I libmissing/m4 +%{__autoconf} +%{__autoheader} +%{__automake} %configure \ --enable-gtk-doc \ - --disable-static \ + --enable-static \ --with%{!?with_perl:out}-perl \ --with%{!?with_python:out}-python \ --with%{!?with_postgresql:out}-postgresql \ @@ -166,8 +174,12 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT -# *.la are generating wrong dependencies (and are not needed anyway) -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*.{la,a} +%if %{without postgresql} && %{without mysql} && %{without sqlite3} +install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/sql +%endif + +# no *.la for plugins +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*/*.{la,a} %if %{with python} %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} @@ -203,9 +215,7 @@ %dir %{_libdir}/%{name}/plugins %dir %{_libdir}/%{name}/plugins/formats %attr(755,root,root) %{_libdir}/%{name}/plugins/formats/classic.so -%if %{with postgresql} || %{with mysql} || %{with sqlite3} %dir %{_libdir}/%{name}/plugins/sql -%endif %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/classic %{_mandir}/man1/preludedb-admin.1* @@ -219,9 +229,9 @@ %{_aclocaldir}/libpreludedb.m4 %{_gtkdocdir}/libpreludedb -#%files static -#%defattr(644,root,root,755) -#%{_libdir}/libpreludedb.a +%files static +%defattr(644,root,root,755) +%{_libdir}/libpreludedb.a %if %{with postgresql} %files pgsql @@ -260,7 +270,7 @@ %defattr(644,root,root,755) %attr(755,root,root) %{py_sitedir}/_preludedb.so %{py_sitedir}/preludedb.py[co] -%{py_sitedir}/preludedb-*.egg-info +%{py_sitedir}/preludedb-*-py*.egg-info %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -269,6 +279,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20 2011/08/10 15:58:14 qboosh +- added lt patch, restored -static package +- made base package invariant wrt. db bconds + Revision 1.19 2011/08/03 12:30:14 paszczus - added Patch0: libpreludedb-mysql-innodb.patch to fix mysql.sql script ================================================================ Index: packages/libpreludedb/libpreludedb-lt.patch diff -u /dev/null packages/libpreludedb/libpreludedb-lt.patch:1.1 --- /dev/null Wed Aug 10 17:58:19 2011 +++ packages/libpreludedb/libpreludedb-lt.patch Wed Aug 10 17:58:14 2011 @@ -0,0 +1,13 @@ +--- libpreludedb-1.0.0/configure.in.orig 2010-03-10 13:45:13.000000000 +0100 ++++ libpreludedb-1.0.0/configure.in 2011-08-10 17:41:34.543209766 +0200 +@@ -75,10 +75,8 @@ + # headers. + AC_MSG_RESULT(Darwin: adding -no-cpp-precomp) + AX_C_CHECK_FLAG(-no-cpp-precomp, , , PCFLAGS="$PCFLAGS -no-cpp-precomp") +- libext=dylib + ;; + *) +- libext=so + AC_MSG_RESULT(none needed) + ;; + esac ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpreludedb/libpreludedb.spec?r1=1.19&r2=1.20&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
