SPECS: qdbm.spec - added -am_ac.patch: replaces some ugly Makefile...
twittner
twittner at pld-linux.org
Mon Apr 17 16:55:00 CEST 2006
Author: twittner Date: Mon Apr 17 14:55:00 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added -am_ac.patch: replaces some ugly Makefile.in's with clear and nice
Makefile.am's for proper linking, --enable-static option, ...
- perl pure_install fix moved from -perl-pure_install.patch to -am_ac.patch
- bcond_without static_libs
- rel. 0.3
---- Files affected:
SPECS:
qdbm.spec (1.5 -> 1.6)
---- Diffs:
================================================================
Index: SPECS/qdbm.spec
diff -u SPECS/qdbm.spec:1.5 SPECS/qdbm.spec:1.6
--- SPECS/qdbm.spec:1.5 Sun Apr 16 12:55:34 2006
+++ SPECS/qdbm.spec Mon Apr 17 16:54:55 2006
@@ -1,28 +1,25 @@
# $Revision$, $Date$
#
-# TODO: - check what going on with linking (it links against already
-# installed libqdbm ?):
-# `checking for main in -lqdbm... no' (or `yes' if qdbm is
-# installed)
-# - check & fix optimazation flags - lack of -march, `-O1'
-# instead of `-O2' in some places
-#
# Conditional build:
%bcond_with java # with Java bindings
%bcond_without perl # with Perl bindings
%bcond_without ruby # with Ruby bindings
+%bcond_without static_libs # don't build static libraries
#
Summary: Quick Database Manager
Summary(pl): Quick Database Manager - szybki silnik bazy danych
Name: qdbm
Version: 1.8.48
-Release: 0.2
+Release: 0.3
License: LGPL
Group: Libraries
Source0: http://qdbm.sourceforge.net/%{name}-%{version}.tar.gz
# Source0-md5: ac59de1fd23478edcb906612fe48f3b8
-Patch0: %{name}-perl-pure_install.patch
+Patch0: %{name}-am_ac.patch
URL: http://qdbm.sourceforge.net/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
%{?with_java:BuildRequires: jdk}
%if %{with perl}
BuildRequires: perl-devel >= 1:5.8.0
@@ -188,20 +185,32 @@
%patch0 -p1
%build
+%{__libtoolize}
+%{__aclocal}
%{__autoconf}
-%configure
+%{__automake}
+%configure \
+ --enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
%{__make}
cd plus
+%{__libtoolize}
+%{__aclocal}
%{__autoconf}
-%configure
+%{__automake}
+%configure \
+ --enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
%{__make}
cd ..
%if %{with java}
cd java
+%{__libtoolize}
+%{__aclocal}
%{__autoconf}
-%configure
+%{__automake}
+%configure \
+ --enable-static=%{?with_static_libs:yes}%{!?with_static_libs:no}
%{__make}
cd ..
%endif
@@ -225,8 +234,11 @@
%endif
cd cgi
+%{__aclocal}
+%{__aclocal}
%{__autoconf}
-%configure
+%{__automake}
+%configure
%{__make}
cd ..
@@ -338,9 +350,11 @@
%{_mandir}/man3/odeum.3*
%{_mandir}/man3/odopen.3*
+%if %{with static_libs}
%files static
%defattr(644,root,root,755)
%{_libdir}/libqdbm.a
+%endif
%files plus
%defattr(644,root,root,755)
@@ -359,9 +373,11 @@
%{_includedir}/xcuria.h
%{_includedir}/xvilla.h
+%if %{with static_libs}
%files plus-static
%defattr(644,root,root,755)
%{_libdir}/libxqdbm.a
+%endif
%files cgi
%defattr(644,root,root,755)
@@ -438,6 +454,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.6 2006/04/17 14:54:55 twittner
+- added -am_ac.patch: replaces some ugly Makefile.in's with clear and nice
+ Makefile.am's for proper linking, --enable-static option, ...
+- perl pure_install fix moved from -perl-pure_install.patch to -am_ac.patch
+- bcond_without static_libs
+- rel. 0.3
+
Revision 1.5 2006/04/16 10:55:34 twittner
- added %%dir for some perl dirs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/qdbm.spec?r1=1.5&r2=1.6&f=u
More information about the pld-cvs-commit
mailing list