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

Proposed by Lenz Grimmer on 2009-04-24
Status: Merged
Merged at revision: not available
Proposed branch: lp:~lenzgr/libdrizzle/libdrizzle-buildfixes
Merge into: lp:~drizzle-trunk/libdrizzle/classic
Diff against target: None lines
To merge this branch: bzr merge lp:~lenzgr/libdrizzle/libdrizzle-buildfixes
Reviewer Review Type Date Requested Status
Eric Day 2009-04-24 Pending
Review via email: mp+5888@code.launchpad.net
To post a comment you must log in.
Lenz Grimmer (lenzgr) wrote :

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)

88. By Eric Day on 2009-04-28

Merged Lenz's pkg updates.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
103 -rm -rf libdrizzle/common.h.gch103 -rm -rf libdrizzle/common.h.gch
104104
105EXTRA_DIST= \105EXTRA_DIST= \
106 PROTOCOL \
106 config/config.rpath \107 config/config.rpath \
107 support/libdrizzle.spec \108 support/libdrizzle.spec \
108 libdrizzle/libdrizzle.ver \109 libdrizzle/libdrizzle.ver \
109110
=== 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 @@
7BuildRequires: gcc7BuildRequires: gcc
8URL: https://launchpad.net/libdrizzle8URL: https://launchpad.net/libdrizzle
99
10Packager: Eric Day <eday@oddments.org>
11
12Source: http://launchpad.net/libdrizzle/%{version}/%{version}/+download/libdrizzle-%{version}.tar.gz10Source: http://launchpad.net/libdrizzle/%{version}/%{version}/+download/libdrizzle-%{version}.tar.gz
13BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot11BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
1412
15%description13%description
16This 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.14This is the the client and protocol library for the Drizzle project. The
15server, drizzled, will use this as for the protocol library, as well as the
16client utilities and any new projects that require low-level protocol
17communication (like proxies). Other language interfaces (PHP extensions, SWIG,
18...) should be built off of this interface.
19
20%package -n %{name}0
21Group: System Environment/Libraries
22Summary: Drizzle Client & Protocol Library
23
24%description -n %{name}0
25This is the the client and protocol library for the Drizzle project. The
26server, drizzled, will use this as for the protocol library, as well as the
27client utilities and any new projects that require low-level protocol
28communication (like proxies). Other language interfaces (PHP extensions, SWIG,
29...) should be built off of this interface.
30
31%package devel
32Group: Development/Libraries
33Summary: Drizzle Client & Protocol Library - Header files
34
35%description devel
36Development files for the Drizzle Client & Protocol Library
1737
18%prep38%prep
19%setup -q39%setup -q
@@ -24,43 +44,31 @@
24%{__make} %{_smp_mflags}44%{__make} %{_smp_mflags}
2545
26%install46%install
27%{__rm} -rf %{buildroot}47%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
28%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
2948
30%clean49%clean
31%{__rm} -rf %{buildroot}50%{__rm} -rf %{buildroot}
3251
33%files52%post -n %{name}0 -p /sbin/ldconfig
34%{_includedir}/libdrizzle/drizzle.h53
35%{_includedir}/libdrizzle/drizzle_client.h54%postun -n %{name}0 -p /sbin/ldconfig
36%{_includedir}/libdrizzle/drizzle_server.h55
37%{_includedir}/libdrizzle/constants.h56%files -n %{name}0
38%{_includedir}/libdrizzle/structs.h57%defattr(-, root, root)
39%{_includedir}/libdrizzle/con.h58%{_libdir}/libdrizzle.so.*
40%{_includedir}/libdrizzle/con_client.h59
41%{_includedir}/libdrizzle/con_server.h60%files devel
42%{_includedir}/libdrizzle/handshake_client.h61%defattr(-, root, root)
43%{_includedir}/libdrizzle/handshake_server.h62%doc AUTHORS ChangeLog COPYING INSTALL NEWS PROTOCOL README
44%{_includedir}/libdrizzle/command_client.h63%{_includedir}/libdrizzle
45%{_includedir}/libdrizzle/command_server.h
46%{_includedir}/libdrizzle/query.h
47%{_includedir}/libdrizzle/result.h
48%{_includedir}/libdrizzle/result_client.h
49%{_includedir}/libdrizzle/result_server.h
50%{_includedir}/libdrizzle/column.h
51%{_includedir}/libdrizzle/column_client.h
52%{_includedir}/libdrizzle/column_server.h
53%{_includedir}/libdrizzle/row_client.h
54%{_includedir}/libdrizzle/row_server.h
55%{_includedir}/libdrizzle/field_client.h
56%{_includedir}/libdrizzle/field_server.h
57%{_libdir}/libdrizzle.a64%{_libdir}/libdrizzle.a
58%{_libdir}/libdrizzle.la65%{_libdir}/libdrizzle.la
59%{_libdir}/libdrizzle.so66%{_libdir}/libdrizzle.so
60%{_libdir}/libdrizzle.so.0
61%{_libdir}/libdrizzle.so.0.0.1
62%{_libdir}/pkgconfig/libdrizzle.pc67%{_libdir}/pkgconfig/libdrizzle.pc
6368
64%changelog69%changelog
70* Fri Apr 24 2009 Lenz Grimmer <lenz@grimmer.com>
71- Added -devel subpackage, updated file list
72- Fixed rpmlint errors and warnings
65* Tue Jan 13 2009 Eric Day <eday@oddments.org> - 0.1-173* Tue Jan 13 2009 Eric Day <eday@oddments.org> - 0.1-1
66- Initial package74- Initial package

Subscribers

People subscribed via source and target branches