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
1=== modified file 'Makefile.am'
2--- Makefile.am 2009-03-31 01:48:13 +0000
3+++ Makefile.am 2009-04-24 21:26:16 +0000
4@@ -103,6 +103,7 @@
5 -rm -rf libdrizzle/common.h.gch
6
7 EXTRA_DIST= \
8+ PROTOCOL \
9 config/config.rpath \
10 support/libdrizzle.spec \
11 libdrizzle/libdrizzle.ver \
12
13=== modified file 'support/libdrizzle.spec.in'
14--- support/libdrizzle.spec.in 2009-01-30 05:38:31 +0000
15+++ support/libdrizzle.spec.in 2009-04-24 22:27:18 +0000
16@@ -7,13 +7,33 @@
17 BuildRequires: gcc
18 URL: https://launchpad.net/libdrizzle
19
20-Packager: Eric Day <eday@oddments.org>
21-
22 Source: http://launchpad.net/libdrizzle/%{version}/%{version}/+download/libdrizzle-%{version}.tar.gz
23 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
24
25 %description
26-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.
27+This is the the client and protocol library for the Drizzle project. The
28+server, drizzled, will use this as for the protocol library, as well as the
29+client utilities and any new projects that require low-level protocol
30+communication (like proxies). Other language interfaces (PHP extensions, SWIG,
31+...) should be built off of this interface.
32+
33+%package -n %{name}0
34+Group: System Environment/Libraries
35+Summary: Drizzle Client & Protocol Library
36+
37+%description -n %{name}0
38+This is the the client and protocol library for the Drizzle project. The
39+server, drizzled, will use this as for the protocol library, as well as the
40+client utilities and any new projects that require low-level protocol
41+communication (like proxies). Other language interfaces (PHP extensions, SWIG,
42+...) should be built off of this interface.
43+
44+%package devel
45+Group: Development/Libraries
46+Summary: Drizzle Client & Protocol Library - Header files
47+
48+%description devel
49+Development files for the Drizzle Client & Protocol Library
50
51 %prep
52 %setup -q
53@@ -24,43 +44,31 @@
54 %{__make} %{_smp_mflags}
55
56 %install
57-%{__rm} -rf %{buildroot}
58-%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
59+%{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
60
61 %clean
62 %{__rm} -rf %{buildroot}
63
64-%files
65-%{_includedir}/libdrizzle/drizzle.h
66-%{_includedir}/libdrizzle/drizzle_client.h
67-%{_includedir}/libdrizzle/drizzle_server.h
68-%{_includedir}/libdrizzle/constants.h
69-%{_includedir}/libdrizzle/structs.h
70-%{_includedir}/libdrizzle/con.h
71-%{_includedir}/libdrizzle/con_client.h
72-%{_includedir}/libdrizzle/con_server.h
73-%{_includedir}/libdrizzle/handshake_client.h
74-%{_includedir}/libdrizzle/handshake_server.h
75-%{_includedir}/libdrizzle/command_client.h
76-%{_includedir}/libdrizzle/command_server.h
77-%{_includedir}/libdrizzle/query.h
78-%{_includedir}/libdrizzle/result.h
79-%{_includedir}/libdrizzle/result_client.h
80-%{_includedir}/libdrizzle/result_server.h
81-%{_includedir}/libdrizzle/column.h
82-%{_includedir}/libdrizzle/column_client.h
83-%{_includedir}/libdrizzle/column_server.h
84-%{_includedir}/libdrizzle/row_client.h
85-%{_includedir}/libdrizzle/row_server.h
86-%{_includedir}/libdrizzle/field_client.h
87-%{_includedir}/libdrizzle/field_server.h
88+%post -n %{name}0 -p /sbin/ldconfig
89+
90+%postun -n %{name}0 -p /sbin/ldconfig
91+
92+%files -n %{name}0
93+%defattr(-, root, root)
94+%{_libdir}/libdrizzle.so.*
95+
96+%files devel
97+%defattr(-, root, root)
98+%doc AUTHORS ChangeLog COPYING INSTALL NEWS PROTOCOL README
99+%{_includedir}/libdrizzle
100 %{_libdir}/libdrizzle.a
101 %{_libdir}/libdrizzle.la
102 %{_libdir}/libdrizzle.so
103-%{_libdir}/libdrizzle.so.0
104-%{_libdir}/libdrizzle.so.0.0.1
105 %{_libdir}/pkgconfig/libdrizzle.pc
106
107 %changelog
108+* Fri Apr 24 2009 Lenz Grimmer <lenz@grimmer.com>
109+- Added -devel subpackage, updated file list
110+- Fixed rpmlint errors and warnings
111 * Tue Jan 13 2009 Eric Day <eday@oddments.org> - 0.1-1
112 - Initial package

Subscribers

People subscribed via source and target branches