X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=blobdiff_plain;f=rpm.macros;h=90728615f4ff6ed43a50789c23b349e40bb8d788;hp=83a76f3349153c172ae953c710964c3fe011fb86;hb=c1caefa55b37605474a82e264ac54aa134c5a734;hpb=5ff86d7405ec5481572aa97d3e277327fc9e791e

diff --git a/rpm.macros b/rpm.macros
index 83a76f3..9072861 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -38,6 +38,9 @@ fi; \
 %__intltoolize		intltoolize --copy --force
 %__libtoolize		libtoolize --copy --force
 
+#	The number of cvs changelog entries kept when building package.
+%_buildchangelogtruncate 20
+
 %dependencytracking	%{nil}
 
 #	Relations between package names that cause dependency loops
@@ -75,10 +78,18 @@ fi; \
 	--sharedstatedir=%{_sharedstatedir} \
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
-	--x-libraries=%{_libdir} \
+	--x-libraries=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
 	%{dependencytracking} \
 }
 
+%cmake { \
+CC="%{__cc}" \
+CXX="%{__cxx}" \
+CFLAGS="%{rpmcflags}" \
+CXXFLAGS="%{rpmcxxflags}" \
+cmake \
+}
+
 #----------------------------------------------------------------
 %global configure_cache 0
 %configure_cache_file   %{buildroot}.configure.cache
@@ -106,7 +117,7 @@ fi; \
 	--sharedstatedir=%{_sharedstatedir} \
 	--mandir=%{_mandir} \
 	--infodir=%{_infodir} \
-	--x-libraries=%{_libdir} \
+	--x-libraries=%{?_x_libraries}%{!?_x_libraries:%{_libdir}} \
 	%{dependencytracking} \
 	%{?configure_cache:--cache-file=%{configure_cache_file:-%{buildroot}.configure.cache}} \
 }
@@ -179,8 +190,11 @@ unset LINGUAS ||:\
 # Example files, programs, scripts...
 %_examplesdir	/usr/src/examples
 
+# Alternative kernel type/version
+%alt_kernel	%{nil}%{?_alt_kernel:-%{?_alt_kernel}}
+
 # The directory holding Linux kernel sources
-%_kernelsrcdir	/usr/src/linux
+%_kernelsrcdir	/usr/src/linux%{alt_kernel}
 
 # If non-empty "debug" macro defined, add "dbg" suffix to release number
 %_rpmfilename		%%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
@@ -188,10 +202,10 @@ unset LINGUAS ||:\
 # Requires name = version-release
 %requires_releq()		%(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' | grep -v "is not")
 
-%releq_kernel_up()		%(LC_ALL="C" rpm -qf --qf '%%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
-%releq_kernel_smp()  		%(LC_ALL="C" rpm -qf --qf '%%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
-%requires_releq_kernel_up()  	%(LC_ALL="C" rpm -qf --qf 'PreReq: %%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
-%requires_releq_kernel_smp()  	%(LC_ALL="C" rpm -qf --qf 'PreReq: %%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
+%releq_kernel_up()  		%((LC_ALL="C" rpm -qf --qf '%%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
+%releq_kernel_smp()  		%((LC_ALL="C" rpm -qf --qf '%%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)")
+%requires_releq_kernel_up(s:)  	Requires%{-s:(%{-s*})}: %releq_kernel_up
+%requires_releq_kernel_smp(s:) 	Requires%{-s:(%{-s*})}: %releq_kernel_smp
 
 %requires_eq()		%(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 %requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' | grep -v "is not")
@@ -230,9 +244,8 @@ unset LINGUAS ||:\
 #
 #%no_install_post_compress_docs	1
 %__spec_install_post_compress_docs { \
-%{!?no_install_post_compress_docs: \
+%{!?no_install_post_compress_docs:__spec_install_post_compress_docs() { \
 	echo "Compress man and info pages."; \
-	%{?verbose:set -x;} \
 	for i in /usr/share/man /usr/X11R6/man /usr/share/info; do \
 		if [ -d "$RPM_BUILD_ROOT$i" ]; then \
 			find "$RPM_BUILD_ROOT$i" -name \*.bz2 -print | xargs -r %{__bzip2} -df; \
@@ -240,7 +253,7 @@ unset LINGUAS ||:\
 			find "$RPM_BUILD_ROOT$i" -type f -print | xargs -r %{__gzip} -9nf; \
 		fi; \
 	done; \
-} }
+}; __spec_install_post_compress_docs } }
 
 #-----------------------------------------------------------------
 # Strip executable binaries and shared object files
@@ -249,8 +262,7 @@ unset LINGUAS ||:\
 #
 #%no_install_post_strip	1
 %__spec_install_post_strip {%{!?debug: \
-%{!?no_install_post_strip: \
-%{?verbose:set -x;} \
+%{!?no_install_post_strip:__spec_install_post_strip() { \
 	if [ -d "$RPM_BUILD_ROOT" ]; then \
 	echo "Strip executable binaries, archives and shared object files."; \
 	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
@@ -269,8 +281,7 @@ unset LINGUAS ||:\
 	if [ -n "$elfarchiveslist" ]; then \
 		%{__strip} --strip-debug --remove-section=.note  --remove-section=.comment $elfarchiveslist; \
 	fi; \
-fi; } \
-} }
+fi; }; __spec_install_post_strip } } }
 
 #-----------------------------------------------------------------
 # remove all RPATH from executable binaries and shared object files
@@ -279,8 +290,7 @@ fi; } \
 #
 #%no_install_post_chrpath	1
 %__spec_install_post_chrpath {%{!?debug: \
-%{!?no_install_post_chrpath: \
-	%{?verbose:set -x;} \
+%{!?no_install_post_chrpath: __spec_install_post_chrpath() { \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
 echo "Remove RPATH from executable binaries and shared object files."; \
 find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"} | xargs -r file | \
@@ -303,8 +313,7 @@ while read file ; do \
 	if [ "$rpath" = "" ] ; then chrpath -d "$file" > /dev/null ; \
 	else chrpath -r "$rpath" "$file" > /dev/null ; fi ; \
 done; \
-fi; } \
-} }
+fi; }; __spec_install_post_chrpath } } }
 
 #-----------------------------------------------------------------
 # Find and gzip all kernel modules
@@ -313,8 +322,7 @@ fi; } \
 #
 #%no_install_post_compress_modules  1
 %__spec_install_post_compress_modules { \
-%{!?no_install_post_compress_modules: \
-	%{?verbose:set -x;} \
+%{!?no_install_post_compress_modules: __spec_install_post_compress_modules() { \
 	if [ -d "$RPM_BUILD_ROOT" ]; then \
 		echo "Compress kernel modules if any."; \
 		if test -d $RPM_BUILD_ROOT/lib/modules ; then \
@@ -324,6 +332,12 @@ fi; } \
 			   while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done; \
 		fi; \
 	fi; \
+}; __spec_install_post_compress_modules } }
+
+# Remove common Perl files we don't package
+%__spec_install_post_perl_clean {\
+%{!?no_install_post_perl_clean: \
+%{?pdir:rm -f $RPM_BUILD_ROOT{%{perl_archlib}/perllocal.pod,%{perl_vendorarch}/auto/%{pdir}%{?pnam:/%(echo %{pnam} | tr - /)}/.packlist}} \
 } }
 
 #-----------------------------------------------------------------
@@ -441,6 +455,7 @@ fi \
 # extract php/zend api versions
 %php_major_version		%(awk '/#define PHP_MAJOR_VERSION/{print $3}' %{__php_includedir}/main/php_version.h 2>/dev/null || echo ERROR)
 %php_api_version		%(awk '/#define PHP_API_VERSION/{print $3}' %{__php_includedir}/main/php.h 2>/dev/null || echo ERROR)
+%php_pdo_api_version	%(awk '/#define PDO_DRIVER_API/{print $3}' %{__php_includedir}/ext/pdo/php_pdo_driver.h 2>/dev/null || echo ERROR)
 %php_debug				%(awk '/#define ZEND_DEBUG/{print $3}' %{__php_includedir}/main/php_config.h 2>/dev/null || echo ERROR)
 %zend_module_api		%(awk '/#define ZEND_MODULE_API_NO/{print $3}' %{__php_includedir}/Zend/zend_modules.h 2>/dev/null || echo ERROR)
 %zend_extension_api		%(awk '/#define ZEND_EXTENSION_API_NO/{print $3}' %{__php_includedir}/Zend/zend_extensions.h 2>/dev/null || echo ERROR)
@@ -461,6 +476,9 @@ fi \
 %{__php_api_requires -v %php_major_version debug php_debug} \
 %{__php_api_requires -v %php_major_version thread-safety zend_zts}
 
+# for php pdo modules (php-pecl-PDO_*)
+%requires_php_pdo_module %{__php_api_requires PDO_API php_pdo_api_version}
+
 # Python specific macro definitions.
 # python main version
 %py_ver		%(python -c "import sys; print sys.version[:3]")
@@ -485,14 +503,14 @@ fi \
 # Hardlink binary identical .pyc and .pyo files
 # (idea by glen <at> pld-linux <dot> org)
 %__spec_install_post_py_hardlink {\
-%{!?no_install_post_py_hardlink: \
+%{!?no_install_post_py_hardlink: __spec_install_post_py_hardlink() { \
 [ ! -d "$RPM_BUILD_ROOT" ] || find "$RPM_BUILD_ROOT" -name '*.pyc' | while read a; do \
 	b="$(echo $a|sed -e 's/.pyc$/.pyo/')"; \
 	if cmp -s "$a" "$b"; then \
 		ln -f "$a" "$b"; \
 	fi; \
 done \
-} }
+}; __spec_install_post_py_hardlink } }
 
 # remove python sources, so that check-files won't complain
 # (idea by glen <at> pld-linux <dot> org)
@@ -618,7 +636,8 @@ else \
 		-g %{-g*} \\\
 		%{-M} \\\
 		%{-G:-G %{-G*}} \\\
-		%{expand:%{%{#}}} 1>&2 \
+		%{expand:%{%{#}}} 1>&2 || exit $? \
+	[ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i passwd \
 fi;
 
 # Usage:
@@ -639,12 +658,15 @@ if [ -n "`/usr/bin/getgid %{1}`" ]; then \
 	fi \
 else \
 	echo "Adding group %{1} GID=%{-g*}." \
-	/usr/sbin/groupadd -g %{-g*} -r %{1} 1>&2 \
+	/usr/sbin/groupadd -g %{-g*} -r %{1} 1>&2 || exit $? \
+	[ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i group \
 fi;
 
 # apache_config_{install/uninstall} macros written by glen@pld-linux.org.
 # All rights reserved. Permission to copy is hereby granted.. yada, yada, yada
 #
+# You should use webapp macros instead. these are here until single piece of them is gone from specs ;)
+#
 # The config is installed/removed inside trigger, this means that you can any
 # time install apache1 or apache package and the configuration file is updated.
 # if you don't need the config for various reason for specific apache, just
@@ -729,7 +751,7 @@ if [ "$1" = "1" ] && [ "$2" = "1" ]; then\
 fi\
 # reload webserver if the config symlink is there and skip reload if webserver is upgraded\
 if [ -L /etc/%1/webapps.d/%2.conf ] && [ "$2" -lt "2" ]; then\
-	%{expand:%service %%1 reload}\
+	%{expand:%service -q %%1 reload}\
 fi\
 %{nil}
 
@@ -741,7 +763,7 @@ fi\
 # remove link if either of the packages are gone \
 if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps.d/%2.conf ]; then \
 	/usr/sbin/webapp unregister %1 %2\
-	%{expand:%service %%1 reload}\
+	%{expand:%service -q %%1 reload}\
 fi \
 %{nil}
 
@@ -783,6 +805,6 @@ if [ "$1" = "0" ] || [ "$2" = "0" ]; then \
 # Usage:
 #   %service [-q] SERVICE ACTION ["SERVICE NICE DESCRIPTION"]
 #
-#  -q be silent when service isn't started (for postun scriplets)
+#  -q be silent when service isn't started (for scriplets restaring other package's services)
 #
 %service(q) {{%(export quiet=%{-q:1}; /usr/lib/rpm/service_generator.sh %{*}) };}