Merge lp:~lenzgr/libdrizzle/libdrizzle-buildfixes into lp:~drizzle-trunk/libdrizzle/classic

[Lenz Grimmer]

[Lenz Grimmer (lenzgr)]

This branch contains fixes to the RPM spec file (created a separate -dev subpackage, fixed rpmlint warnings) and adds the PROTOCOL file to the source distribution (and to the binary RPMs respectively)

[lp:~lenzgr/libdrizzle/libdrizzle-buildfixes]

88. By Eric Day on 2009-04-28

Merged Lenz's pkg updates.

=== modified file 'Makefile.am'
--- Makefile.am	2009-03-31 01:48:13 +0000
+++ Makefile.am	2009-04-24 21:26:16 +0000
@@ -103,6 +103,7 @@
 	-rm -rf libdrizzle/common.h.gch
 
 EXTRA_DIST= \
+	PROTOCOL \
 	config/config.rpath \
 	support/libdrizzle.spec \
 	libdrizzle/libdrizzle.ver \

=== modified file 'support/libdrizzle.spec.in'
--- support/libdrizzle.spec.in	2009-01-30 05:38:31 +0000
+++ support/libdrizzle.spec.in	2009-04-24 22:27:18 +0000
@@ -7,13 +7,33 @@
 BuildRequires: gcc
 URL: https://launchpad.net/libdrizzle
 
-Packager: Eric Day <[e-mail]>
-
 Source: http://launchpad.net/libdrizzle/%{version}/%{version}/+download/libdrizzle-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 %description
-This is the the client and protocol library for the Drizzle project. The server, drizzled, will use this as for the protocol library, as well as the client utilities and any new projects that require low-level protocol communication (like proxies). Other language interfaces (PHP extensions, SWIG, ...) should be built off of this interface.
+This is the the client and protocol library for the Drizzle project. The
+server, drizzled, will use this as for the protocol library, as well as the
+client utilities and any new projects that require low-level protocol
+communication (like proxies). Other language interfaces (PHP extensions, SWIG,
+...) should be built off of this interface.
+
+%package -n %{name}0
+Group: System Environment/Libraries
+Summary: Drizzle Client & Protocol Library
+
+%description -n %{name}0
+This is the the client and protocol library for the Drizzle project. The
+server, drizzled, will use this as for the protocol library, as well as the
+client utilities and any new projects that require low-level protocol
+communication (like proxies). Other language interfaces (PHP extensions, SWIG,
+...) should be built off of this interface.
+
+%package devel
+Group: Development/Libraries
+Summary: Drizzle Client & Protocol Library - Header files
+
+%description devel
+Development files for the Drizzle Client & Protocol Library
 
 %prep
 %setup -q
@@ -24,43 +44,31 @@
 %{__make} %{_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install  DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
+%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
 
 %clean
 %{__rm} -rf %{buildroot}
 
-%files
-%{_includedir}/libdrizzle/drizzle.h
-%{_includedir}/libdrizzle/drizzle_client.h
-%{_includedir}/libdrizzle/drizzle_server.h
-%{_includedir}/libdrizzle/constants.h
-%{_includedir}/libdrizzle/structs.h
-%{_includedir}/libdrizzle/con.h
-%{_includedir}/libdrizzle/con_client.h
-%{_includedir}/libdrizzle/con_server.h
-%{_includedir}/libdrizzle/handshake_client.h
-%{_includedir}/libdrizzle/handshake_server.h
-%{_includedir}/libdrizzle/command_client.h
-%{_includedir}/libdrizzle/command_server.h
-%{_includedir}/libdrizzle/query.h
-%{_includedir}/libdrizzle/result.h
-%{_includedir}/libdrizzle/result_client.h
-%{_includedir}/libdrizzle/result_server.h
-%{_includedir}/libdrizzle/column.h
-%{_includedir}/libdrizzle/column_client.h
-%{_includedir}/libdrizzle/column_server.h
-%{_includedir}/libdrizzle/row_client.h
-%{_includedir}/libdrizzle/row_server.h
-%{_includedir}/libdrizzle/field_client.h
-%{_includedir}/libdrizzle/field_server.h
+%post -n %{name}0 -p /sbin/ldconfig
+
+%postun -n %{name}0 -p /sbin/ldconfig
+
+%files -n %{name}0
+%defattr(-, root, root)
+%{_libdir}/libdrizzle.so.*
+
+%files devel
+%defattr(-, root, root)
+%doc AUTHORS ChangeLog COPYING INSTALL NEWS PROTOCOL README
+%{_includedir}/libdrizzle
 %{_libdir}/libdrizzle.a
 %{_libdir}/libdrizzle.la
 %{_libdir}/libdrizzle.so
-%{_libdir}/libdrizzle.so.0
-%{_libdir}/libdrizzle.so.0.0.1
 %{_libdir}/pkgconfig/libdrizzle.pc
 
 %changelog
+* Fri Apr 24 2009 Lenz Grimmer <[e-mail]>
+- Added -devel subpackage, updated file list
+- Fixed rpmlint errors and warnings
 * Tue Jan 13 2009 Eric Day <[e-mail]> - 0.1-1
 - Initial package