From commits-return-9959-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sat Aug 30 18:59:21 2008 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 39469 invoked from network); 30 Aug 2008 18:59:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Aug 2008 18:59:21 -0000 Received: (qmail 87384 invoked by uid 500); 30 Aug 2008 18:59:19 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 87334 invoked by uid 500); 30 Aug 2008 18:59:19 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 87325 invoked by uid 99); 30 Aug 2008 18:59:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 11:59:19 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 18:58:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7395B238896B; Sat, 30 Aug 2008 11:58:29 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690551 - /apr/apr-util/trunk/build/rpm/apr-util.spec.in Date: Sat, 30 Aug 2008 18:58:29 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080830185829.7395B238896B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: minfrin Date: Sat Aug 30 11:58:28 2008 New Revision: 690551 URL: http://svn.apache.org/viewvc?rev=690551&view=rev Log: Update the RPM spec file to depend on the bzip2 binary instead of the gzip binary. Include the formal path to the source, to match the Fedora spec file. Create separate discrete packages corresponding to the DBD and LDAP modules, as per Bojan Smojver's changes to the Fedora spec file. Modified: apr/apr-util/trunk/build/rpm/apr-util.spec.in Modified: apr/apr-util/trunk/build/rpm/apr-util.spec.in URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/rpm/apr-util.spec.in?rev=690551&r1=690550&r2=690551&view=diff ============================================================================== --- apr/apr-util/trunk/build/rpm/apr-util.spec.in (original) +++ apr/apr-util/trunk/build/rpm/apr-util.spec.in Sat Aug 30 11:58:28 2008 @@ -8,11 +8,10 @@ License: Apache Software License Group: System Environment/Libraries URL: http://apr.apache.org/ -Source0: %{name}-%{version}.tar.gz +Source0: http://www.apache.org/dist/apr/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release} -BuildPrereq: openldap-devel, db4-devel, expat-devel -Conflicts: subversion < 0.20.1-2 +BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 1.3.0 +BuildPrereq: db4-devel, expat-devel %description The mission of the Apache Portable Runtime (APR) is to provide a @@ -24,8 +23,7 @@ Group: Development/Libraries Summary: APR utility library development kit Requires: apr-util = %{version}-%{release}, apr-devel -Requires: openldap-devel, db4-devel, expat-devel -Conflicts: subversion-devel < 0.20.1-2 +Requires: db4-devel, expat-devel %description devel This package provides the support files which can be used to @@ -33,13 +31,75 @@ of the Apache Portable Runtime (APR) is to provide a free library of C data structures and routines. +%package pgsql +Group: Development/Libraries +Summary: APR utility library PostgreSQL DBD driver +BuildRequires: postgresql-devel +Requires: apr-util = %{version}-%{release} + +%description pgsql +This package provides the PostgreSQL driver for the apr-util +DBD (database abstraction) interface. + +%package mysql +Group: Development/Libraries +Summary: APR utility library MySQL DBD driver +BuildRequires: mysql-devel +Requires: apr-util = %{version}-%{release} + +%description mysql +This package provides the MySQL driver for the apr-util DBD +(database abstraction) interface. + +%package sqlite +Group: Development/Libraries +Summary: APR utility library SQLite DBD driver +BuildRequires: sqlite-devel >= 3.0.0 +Requires: apr-util = %{version}-%{release} + +%description sqlite +This package provides the SQLite driver for the apr-util DBD +(database abstraction) interface. + +%package freetds +Group: Development/Libraries +Summary: APR utility library FreeTDS DBD driver +BuildRequires: freetds-devel +Requires: apr-util = %{version}-%{release} + +%description freetds +This package provides the FreeTDS driver for the apr-util DBD +(database abstraction) interface. + +%package odbc +Group: Development/Libraries +Summary: APR utility library ODBC DBD driver +BuildRequires: unixODBC-devel +Requires: apr-util = %{version}-%{release} + +%description odbc +This package provides the ODBC driver for the apr-util DBD +(database abstraction) interface. + +%package ldap +Group: Development/Libraries +Summary: APR utility library LDAP support +BuildRequires: openldap-devel +Requires: apr-util = %{version}-%{release} + +%description ldap +This package provides the LDAP support for the apr-util. + %prep %setup -q %build %configure --with-apr=%{_prefix} \ --includedir=%{_includedir}/apr-%{apuver} \ - --with-ldap --without-gdbm + --with-ldap --without-gdbm \ + --with-sqlite3 --with-pgsql --with-mysql --with-freetds --with-odbc \ + --with-berkeley-db \ + --without-sqlite2 make %{?_smp_mflags} && make dox %check @@ -70,6 +130,31 @@ %defattr(-,root,root,-) %doc CHANGES LICENSE NOTICE %{_libdir}/libaprutil-%{apuver}.so.* +%dir %{_libdir}/apr-util-%{apuver} + +%files pgsql +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_pgsql* + +%files mysql +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_mysql* + +%files sqlite +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_sqlite* + +%files freetds +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_freetds* + +%files odbc +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_dbd_odbc* + +%files ldap +%defattr(-,root,root,-) +%{_libdir}/apr-util-%{apuver}/apr_ldap* %files devel %defattr(-,root,root,-)