Drizzle Client & Protocol Library

Merge lp://qastaging/~derks/libdrizzle/rpm-spec into lp://qastaging/~drizzle-trunk/libdrizzle/classic

  1. rpm-spec
  2. Merge into classic
Proposed by BJ Dierkes
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~derks/libdrizzle/rpm-spec
Merge into: lp://qastaging/~drizzle-trunk/libdrizzle/classic
Diff against target: 95 lines (+20/-26)
1 file modified
support/libdrizzle.spec.in (+20/-26)
To merge this branch: bzr merge lp://qastaging/~derks/libdrizzle/rpm-spec
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+20416@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
BJ Dierkes (derks) wrote :

Added a number of minor "cosmetic" rather than functional spec changes for ./support/libdrizzle.spec.in. Changes are based on Fedora Packaging Guidelines.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'support/libdrizzle.spec.in'
2--- support/libdrizzle.spec.in 2009-11-30 21:03:35 +0000
3+++ support/libdrizzle.spec.in 2010-03-02 01:29:13 +0000
4@@ -1,14 +1,13 @@
5 Summary: Drizzle Client & Protocol Library
6-Name: @PACKAGE@
7+Name: @PACKAGE@
8 Version: @VERSION@
9 Release: 1
10 License: BSD
11 Group: System Environment/Libraries
12 BuildRequires: gcc gcc-c++
13 URL: https://launchpad.net/libdrizzle
14-
15 Source: http://launchpad.net/libdrizzle/%{version}/%{version}/+download/libdrizzle-%{version}.tar.gz
16-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
17+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
18
19 %description
20 This is the the client and protocol library for the Drizzle project. The
21@@ -17,21 +16,10 @@
22 communication (like proxies). Other language interfaces (PHP extensions, SWIG,
23 ...) should be built off of this interface.
24
25-%package -n %{name}0
26-Group: System Environment/Libraries
27-Summary: Drizzle Client & Protocol Library
28-
29-%description -n %{name}0
30-This is the the client and protocol library for the Drizzle project. The
31-server, drizzled, will use this as for the protocol library, as well as the
32-client utilities and any new projects that require low-level protocol
33-communication (like proxies). Other language interfaces (PHP extensions, SWIG,
34-...) should be built off of this interface.
35-
36 %package devel
37 Group: Development/Libraries
38 Summary: Drizzle Client & Protocol Library - Header files
39-Requires: %{name}0
40+Requires: %{name} = %{version}-%{release}
41
42 %description devel
43 Development files for the Drizzle Client & Protocol Library
44@@ -45,34 +33,40 @@
45 %{__make} %{_smp_mflags}
46
47 %install
48+%{__rm} -rf %{buildroot}
49 %{__make} install DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
50
51 %clean
52 %{__rm} -rf %{buildroot}
53
54-%post -n %{name}0 -p /sbin/ldconfig
55-
56-%postun -n %{name}0 -p /sbin/ldconfig
57-
58-%files -n %{name}0
59-%defattr(-, root, root)
60-%{_libdir}/libdrizzle.so.*
61+%post -p /sbin/ldconfig
62+%postun -p /sbin/ldconfig
63+
64+%files
65+%defattr(-,root,root)
66+%doc AUTHORS ChangeLog COPYING INSTALL NEWS PROTOCOL README
67+%attr(0755,root,root) %{_libdir}/libdrizzle.so.*
68
69 %files devel
70-%defattr(-, root, root)
71-%doc AUTHORS ChangeLog COPYING INSTALL NEWS PROTOCOL README
72+%defattr(-,root,root)
73 %{_includedir}/libdrizzle
74-%{_libdir}/libdrizzle.a
75 %{_libdir}/libdrizzle.la
76+%{_libdir}/pkgconfig/libdrizzle.pc
77 %{_libdir}/libdrizzle.so
78-%{_libdir}/pkgconfig/libdrizzle.pc
79
80 %changelog
81+* Sun Feb 28 2010 BJ Dierkes <wdierkes@rackspace.com> - 0.7-1
82+- Removed subpackage "name 0" (base package provides this functionality)
83+- Moved NEWS/ChangeLog/Etc under main package (not under -devel)
84+- devel package Requires full version-release
85+
86 * Mon Nov 30 2009 Lenz Grimmer <lenz@grimmer.com>
87 - Added Build requirement for gcc-c++
88 - Made the -devel package dependent on the shared lib
89+
90 * Fri Apr 24 2009 Lenz Grimmer <lenz@grimmer.com>
91 - Added -devel subpackage, updated file list
92 - Fixed rpmlint errors and warnings
93+
94 * Tue Jan 13 2009 Eric Day <eday@oddments.org> - 0.1-1
95 - Initial package

Subscribers

People subscribed via source and target branches