[packages/libcassandra] - fix autoconf/automake regeneration - update doc - remove -Werror and O3 from CFLAGS
baggins
baggins at pld-linux.org
Tue Jan 28 20:24:39 CET 2014
commit e647b545a766b03ebf6aeb9657a9e0eb11bfd2c6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jan 28 20:24:02 2014 +0100
- fix autoconf/automake regeneration
- update doc
- remove -Werror and O3 from CFLAGS
libcassandra-ac.patch | 32 ++++++++++++++++++++++++++++++++
libcassandra.spec | 11 +++++++----
2 files changed, 39 insertions(+), 4 deletions(-)
---
diff --git a/libcassandra.spec b/libcassandra.spec
index 5a3c3b0..ba1957c 100644
--- a/libcassandra.spec
+++ b/libcassandra.spec
@@ -10,6 +10,7 @@ Group: Libraries
Source0: https://download.github.com/matkor-libcassandra-%{version}-0-g98ab52b.tar.gz
# Source0-md5: 8563f97a35ca4b465250e1e26873016e
# Patch0: %{name}-link_fix.patch
+Patch1: %{name}-ac.patch
URL: https://github.com/posulliv/libcassandra
BuildRequires: autoconf
BuildRequires: automake
@@ -45,6 +46,10 @@ Pliki nagłówkowe biblioteki libcassandra.
%prep
%setup -q -n matkor-libcassandra-98ab52b
# %patch0 -p1
+%patch1 -p1
+
+%{__sed} -i -e 's|-Werror||g' m4/pandora_canonical.m4 m4/pandora_warnings.m4
+%{__sed} -i -e 's|-O3||g' m4/pandora_optimize.m4
%build
%{__libtoolize}
@@ -55,12 +60,10 @@ Pliki nagłówkowe biblioteki libcassandra.
%configure \
CXXFLAGS="%{rpmcxxflags} -Wno-variadic-macros -Wno-deprecated"
-%{__make}
+%{__make} V=1
%install
rm -rf $RPM_BUILD_ROOT
-# create directories if necessary
-#install -d $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
@@ -73,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-# %doc AUTHORS CREDITS ChangeLog NEWS README THANKS TODO
+%doc AUTHORS ChangeLog README TODO
%attr(755,root,root) %{_libdir}/libcassandra.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libcassandra.so.3
%attr(755,root,root) %{_libdir}/libgenthrift.so.*.*.*
diff --git a/libcassandra-ac.patch b/libcassandra-ac.patch
new file mode 100644
index 0000000..102c299
--- /dev/null
+++ b/libcassandra-ac.patch
@@ -0,0 +1,32 @@
+--- matkor-libcassandra-98ab52b/configure.ac~ 2011-06-01 13:08:55.000000000 +0200
++++ matkor-libcassandra-98ab52b/configure.ac 2014-01-28 20:06:30.684885060 +0100
+@@ -15,6 +15,7 @@
+
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
++AM_PROG_AR
+
+ PANDORA_CANONICAL_TARGET(less-warnings, warnings-always-on, require-cxx, skip-visibility)
+
+--- matkor-libcassandra-98ab52b/libgenthrift/Makefile.am~ 2011-06-01 13:08:55.000000000 +0200
++++ matkor-libcassandra-98ab52b/libgenthrift/Makefile.am 2014-01-28 20:08:52.814886023 +0100
+@@ -19,16 +19,16 @@
+
+
+ # where to install the headers on the system
+-libgenthrift_ladir = $(includedir)/libgenthrift
++libgenthriftdir = $(includedir)/libgenthrift
+
+ # the sources to add to the library and to add to the source distribution
+-libgenthrift_la_HEADERS = \
++libgenthrift_HEADERS = \
+ cassandra_constants.h \
+ Cassandra.h \
+ cassandra_types.h
+
+ libgenthrift_la_SOURCES= \
+- $(libgenthrift_la_HEADERS ) \
++ $(libgenthrift_HEADERS) \
+ cassandra_constants.cpp \
+ Cassandra.cpp \
+ cassandra_types.cpp
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libcassandra.git/commitdiff/e647b545a766b03ebf6aeb9657a9e0eb11bfd2c6
More information about the pld-cvs-commit
mailing list