packages: mysql-q4m/mysql-q4m.spec, mysql-q4m/destdir.patch (NEW) - builds ...

[glen]

Author: glen                         Date: Wed May 18 22:07:48 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- builds with mysql-devel 5.1 installed under th

---- Files affected:
packages/mysql-q4m:
   mysql-q4m.spec (1.2 -> 1.3) , destdir.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mysql-q4m/mysql-q4m.spec
diff -u packages/mysql-q4m/mysql-q4m.spec:1.2 packages/mysql-q4m/mysql-q4m.spec:1.3
--- packages/mysql-q4m/mysql-q4m.spec:1.2	Wed May 18 23:32:50 2011
+++ packages/mysql-q4m/mysql-q4m.spec	Thu May 19 00:07:43 2011
@@ -2,6 +2,9 @@
 # TODO
 # - port to mysql 5.5 (mysql_priv.h missing)
 # - build out of source tree (mysql_priv.h ...)
+# - system boost
+# - check so linking
+# - add -avoid-version to module, install to mysql dir
 Summary:	Queue for MySQL is a message queue
 Name:		mysql-q4m
 Version:	0.9.5
@@ -11,25 +14,28 @@
 Source0:	http://q4m.kazuhooku.com/dist/q4m-%{version}.tar.gz
 # Source0-md5:	b7d9f659c0481d808c32f240b7719e1d
 Source1:	http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.1/mysql-5.1.55.tar.gz
-# Source1-md5:	e07e79edad557874d0870c914c9c81e1
-#Source1:	http://vesta.informatik.rwth-aachen.de/mysql/Downloads/MySQL-5.5/mysql-5.5.11.tar.gz
-#Patch0:		build.patch
+Patch0:		destdir.patch
 URL:		http://q4m.github.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
-BuildRequires:	mysql-devel >= 5.0
+BuildRequires:	mysql-devel >= 5.1
+BuildRequires:	rpmbuild(macros) >= 1.553
+Requires:	mysql >= 5.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		skip_post_check_so	libqueue_engine.so.0.0.0
+
 %description
 Q4M (Queue for MySQL) is a message queue licensed under GPL that works
 as a pluggable storage engine of MySQL 5.1, designed to be robust,
-fast, flexible. It is already in production quality, and is used by
-several web services (see Users of Q4M).
+fast, flexible.
 
 %prep
 %setup -qn q4m-%{version} -a1
-#%patch0 -p1
+%undos Makefile.am
+%patch0 -p1
 ln -s mysql-5.* mysql-src
 
 %build
@@ -41,6 +47,7 @@
 %{__automake}
 %configure \
 	--with-mysql=$(pwd)/mysql-src \
+	--disable-static \
 	--enable-mmap \
 	--prefix=%{_prefix} \
 	--with-delete=pwrite \
@@ -52,12 +59,21 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+rm $RPM_BUILD_ROOT%{_libdir}/libqueue_engine.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README doc
+%attr(755,root,root) %{_bindir}/q4m-forward
+%attr(755,root,root) %{_libdir}/libqueue_engine.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libqueue_engine.so.0
+%attr(755,root,root) %{_libdir}/libqueue_engine.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -65,6 +81,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/05/18 22:07:43  glen
+- builds with mysql-devel 5.1 installed under th
+
 Revision 1.2  2011/05/18 21:32:50  glen
 - seems to build with 5.1 only, if even that
 

================================================================
Index: packages/mysql-q4m/destdir.patch
diff -u /dev/null packages/mysql-q4m/destdir.patch:1.1
--- /dev/null	Thu May 19 00:07:48 2011
+++ packages/mysql-q4m/destdir.patch	Thu May 19 00:07:43 2011
@@ -0,0 +1,12 @@
+--- q4m-0.9.5/Makefile.am	2011-05-19 01:00:32.877553750 +0300
++++ q4m-0.9.5/Makefile.am	2011-05-19 01:02:45.366389710 +0300
+@@ -13,7 +13,8 @@
+          && rm -fr $(bindistdir); }; }
+ 
+ install-exec-hook:
+-	$(INSTALL) $(SUPPORT_BIN) $(bindir)
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL) $(SUPPORT_BIN) $(DESTDIR)$(bindir)
+ 	@cat support-files/install-exec-hook.txt
+ 
+ dist-doc:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql-q4m/mysql-q4m.spec?r1=1.2&r2=1.3&f=u