libmemcached-1.0.17-1, php-ext-mysqlnd_qc-1.2.0-3, postfix-2.10.3-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8200 ec354946-7b23-47d6-9f5a-488ba84defc7

lib/libm/libmemcached/libmemcached-vl.spec

@@ -1,9 +1,9 @@
-%global with_tests       %{?_with_tests:1}%{!?_with_tests:0}
+%bcond_with tests
 
 Name:      libmemcached
 Summary:   Client library and command line tools for memcached server
-Version:   1.0.7
-Release:   2%{?_dist_release}
+Version:   1.0.17
+Release:   1%{?_dist_release}
 License:   BSD
 Group:     System Environment/Libraries
 URL:       http://libmemcached.org/
@@ -14,11 +14,17 @@ URL:       http://libmemcached.org/
 # source tarball, and run "./strip-hsieh.sh <version>" to produce the
 # "-exhsieh" tarball.
 Source0:   libmemcached-%{version}-exhsieh.tar.gz
+Source1:   strip-hsieh.sh
+
+# fix https://bugs.launchpad.net/libmemcached/+bug/1220452
+Patch0:    libmemcached-memcached.patch
+# fix https://bugs.launchpad.net/libmemcached/+bug/1169311
+Patch1:    0bb781d2-a19f-11e2-90e1-002481e91f22.txt
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: cyrus-sasl-devel
 BuildRequires: flex bison
-%if %{with_tests}
+%if %{with tests}
 BuildRequires: memcached
 %endif
 BuildRequires: libevent-devel
@@ -64,6 +70,8 @@ you will need to install %{name}-devel.
 
 %prep
 %setup -q
+%patch0 -p1 -b .without-memcached
+%patch1 -p0 -b .compile-option
 
 mkdir examples
 cp -p tests/*.{cc,h} examples/
@@ -74,11 +82,17 @@ rm -f libmemcached/csl/{parser,scanner}.cc
 # Temporary fix for SASL detection
 sed -i -e s/ax_cv_sasl/ac_enable_sasl/ configure
 
+# fix library dependency
+# perl -pi -e 's/^(Libs:.+)$/$1 -lpthread/' ./support/libmemcached.pc.in
 
 %build
+aclocal
+autoconf
+automake --add-missing
+
 # option --with-memcached=false to disable server binary check (as we don't run test)
 %configure --disable-static \
-%if ! %{with_tests}
+%if ! %{with tests}
    --with-memcached=false
 %endif
 
@@ -91,7 +105,7 @@ make install  DESTDIR="%{buildroot}" AM_INSTALL_PROGRAM_FLAGS=""
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 # test suite cannot run in mock (same port use for memcache servers on all arch)
 # All tests completed successfully
 # diff output.res output.cmp fails but result depend on server version
@@ -118,26 +132,16 @@ rm -rf %{buildroot}
 %doc AUTHORS COPYING README THANKS TODO ChangeLog
 %{_bindir}/mem*
 %exclude %{_libdir}/lib*.la
-%{_libdir}/libhashkit.so.2*
-%{_libdir}/libmemcached.so.10*
-%{_libdir}/libmemcachedprotocol.so.0*
-%{_libdir}/libmemcachedutil.so.2*
+%{_libdir}/lib*.so.*
 %{_mandir}/man1/mem*
 
 
 %files devel
 %defattr (-,root,root,-) 
 %doc examples
-%{_includedir}/libmemcached
-%{_includedir}/libmemcached-1.0
-%{_includedir}/libhashkit
-%{_includedir}/libhashkit-1.0
-%{_includedir}/libmemcachedprotocol-0.0
-%{_includedir}/libmemcachedutil-1.0
-%{_libdir}/libhashkit.so
-%{_libdir}/libmemcached.so
-%{_libdir}/libmemcachedprotocol.so
-%{_libdir}/libmemcachedutil.so
+%{_datadir}/aclocal/ax_libmemcached.m4
+%{_includedir}/*
+%{_libdir}/lib*.so
 %{_libdir}/pkgconfig/libmemcached.pc
 %{_mandir}/man3/libmemcached*
 %{_mandir}/man3/libhashkit*
@@ -146,6 +150,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 18 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.17-1
+- new upstream release.
+
 * Thu May 03 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.7-2
 - built for Vine Linux.
 

p/php-ext-mysqlnd_qc/php-ext-mysqlnd_qc-vl.spec

@@ -2,7 +2,7 @@ Summary: A query cache plugin for mysqlnd
 Summary(ja): mysqlnd クエリキャッシュプラグイン
 Name: php-ext-mysqlnd_qc
 Version: 1.2.0
-Release: 2%{_dist_release}
+Release: 3%{_dist_release}
 URL: http://pecl.php.net/package/mysqlnd_qc
 Source: mysqlnd_qc-%{version}.tgz
 License: The PHP License
@@ -38,6 +38,7 @@ rm -f ../package.xml
 /usr/bin/phpize
 
 %build
+export LIBS="-lpthread"
 %configure --enable-mysqlnd-qc-memcache
 %__make %{_smp_mflags}
 
@@ -63,6 +64,9 @@ rm -rf %{buildroot}
 %{_sysconfdir}/php5/php.d/*
 
 %changelog
+* Sat Jan 18 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-3
+- rebuilt with libmemcached-1.0.17.
+
 * Thu Jan 09 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.0-2
 - rebuilt with current environment.
 

p/postfix/postfix-vl.spec

@@ -27,7 +27,7 @@
 %define postfix_readme_dir      %{postfix_doc_dir}/README_FILES
 
 
-%define origversion 2.10.2
+%define origversion 2.10.3
 
 # Macro: %{dynmap_add_cmd <name> [-m]}
 %define dynmap_add_cmd(m) FILE=%{_sysconfdir}/postfix/dynamicmaps.cf; if ! grep -q "^%{1}[[:space:]]" ${FILE}; then echo "Adding %{1} map entry to ${FILE}"; printf '%%-8s%%-35s%%-18s%%s\\n' %{1} %{_libdir}/postfix/dict_%{1}.so dict_%{1}_open %{-m:mkmap_%{1}_open} >> ${FILE}; fi;
@@ -504,6 +504,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postfix/dict_pcre.so
 
 %changelog
+* Sat Jan 18 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.3-1
+- new upstream release.
+
 * Mon Oct 28 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.10.2-1
 - update to 2.10.2