- ensure to include eol after update_desktop_database*/update_mime_database/update_ic...

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 52ee32497e3d839ce5adea50b3ae64f4ba997fd3..cd3c3998a792dbfade1c4602ae28ce0c71945d15 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -15,7 +15,6 @@
 %__autopoint           autopoint --force
 
 %__gettextize { \
 %__autopoint           autopoint --force
 
 %__gettextize { \

-if ! gettextize --version | grep -q '0\.10\.' ; then \

        if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
                gettextize --copy --force --no-changelog; \
        else \
        if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
                gettextize --copy --force --no-changelog; \
        else \


@@ -24,9 +23,6 @@ if ! gettextize --version | grep -q '0\.10\.' ; then \
        if [ ! -f po/Makevars ]; then \
                cp -f po/Makevars{.template,}; \
        fi; \
        if [ ! -f po/Makevars ]; then \
                cp -f po/Makevars{.template,}; \
        fi; \

-else \
-       gettextize --copy --force; \
-fi; \

 }
 
 %__glib_gettextize     glib-gettextize --copy --force
 }
 
 %__glib_gettextize     glib-gettextize --copy --force


@@ -147,10 +143,18 @@ CXXFLAGS="%{rpmcxxflags}" \
 }
 
 # override __scons to add -j4 in your ~/.rpmmacros for parallel make
 }
 
 # override __scons to add -j4 in your ~/.rpmmacros for parallel make

-# TODO: find way to pass CC/CXX and CC/CXXFLAGS

 %__scons       /usr/bin/scons
 %scons { \
 %{__scons} \
 %__scons       /usr/bin/scons
 %scons { \
 %{__scons} \

+       LDFLAGS="${LDFLAGS:-%rpmldflags}" \
+       CFLAGS="${CFLAGS:-%rpmcflags}" \
+       CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
+       FFLAGS="${FFLAGS:-%rpmcflags}" \
+       CPPFLAGS="${CPPFLAGS:-}" \
+       %{?__cc:CC="%{__cc}"} \
+       %{?__cxx:CXX="%{__cxx}"} \
+       libsuffix=%{_lib} \
+       prefix=%{_prefix} \

 }
 
 # waf. see waf.spec
 }
 
 # waf. see waf.spec


@@ -482,14 +486,16 @@ fi \
 %update_desktop_database_post() {{ \
        umask 022; \
        /usr/bin/update-desktop-database -q; \
 %update_desktop_database_post() {{ \
        umask 022; \
        /usr/bin/update-desktop-database -q; \

-}}
+}} \
+%{nil}

 
 %update_desktop_database_postun() {{ \
 if [ $1 = 0 ]; then \
        umask 022; \
        /usr/bin/update-desktop-database -q; \
 fi \
 
 %update_desktop_database_postun() {{ \
 if [ $1 = 0 ]; then \
        umask 022; \
        /usr/bin/update-desktop-database -q; \
 fi \

-}}
+}} \
+%{nil}

 
 #-----------------------------------------------------------------
 # Update shared MIME info database
 
 #-----------------------------------------------------------------
 # Update shared MIME info database


@@ -498,7 +504,8 @@ fi \
 %update_mime_database() {{ \
        umask 022; \
        /usr/bin/update-mime-database %{_datadir}/mime; \
 %update_mime_database() {{ \
        umask 022; \
        /usr/bin/update-mime-database %{_datadir}/mime; \

-}}
+}} \
+%{nil}

 
 #-----------------------------------------------------------------
 # Update icon cache
 
 #-----------------------------------------------------------------
 # Update icon cache


@@ -507,7 +514,8 @@ fi \
 %update_icon_cache() {{ \
        umask 022; \
        /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \
 %update_icon_cache() {{ \
        umask 022; \
        /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \

-}}
+}} \
+%{nil}

 
 #-----------------------------------------------------------------
 # Update scrollkeeper database
 
 #-----------------------------------------------------------------
 # Update scrollkeeper database


@@ -1083,16 +1091,7 @@ fi \
 # command invoking pear cli
 %__pear /usr/bin/pear
 
 # command invoking pear cli
 %__pear /usr/bin/pear
 

-# The main macro.
-# using this macro will append optional-packages.txt to the nocompressdoc list
-# as it's displayed to user after package install. and adding additional gzip
-# dep is just waste ;)
-%pear_package_setup(a:n:zD) \
-%define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
-%define builddir %{_builddir}/%{srcdir} \
-%setup -q -c -T %{-D:-D} -n %{srcdir} \
-%{-z:tar zxf %{S:0}; %{-a:tar zxf %{S:%{-a*}}}} \
-%{-z:_P=package2.xml; [ -f $_P ] || _P=package.xml; _N=%{srcdir}; mv $_P $_N; cd $_N} \
+%pear_install(a:n:zD) \

 %__pear \\\
        -c pearrc \\\
        -d doc_dir=/docs \\\
 %__pear \\\
        -c pearrc \\\
        -d doc_dir=/docs \\\


@@ -1105,7 +1104,20 @@ fi \
        --offline \\\
        --nodeps \\\
        %{-f:--force} \\\
        --offline \\\
        --nodeps \\\
        %{-f:--force} \\\

-       %{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:$_P} > .install.log || { c=$?; cat .install.log; exit $c; } \
+       %{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:$_P} > .install.log || { c=$?; cat .install.log; exit $c; }; \
+%{nil}
+
+# The main macro.
+# using this macro will append optional-packages.txt to the nocompressdoc list
+# as it's displayed to user after package install. and adding additional gzip
+# dep is just waste ;)
+%pear_package_setup(a:n:zD) \
+%define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
+%define builddir %{_builddir}/%{srcdir} \
+%setup -q -c -T %{-D:-D} -n %{srcdir} \
+%{-z:tar zxf %{S:0}; %{-a:tar zxf %{S:%{-a*}}}} \
+%{-z:_P=package2.xml; [ -f $_P ] || _P=package.xml; _N=%{srcdir}; mv $_P $_N; cd $_N} \
+%pear_install \

 %{-z:cd ..} \
 cat %{-z:$_N/}.install.log | %__pear_install_log \
 \
 %{-z:cd ..} \
 cat %{-z:$_N/}.install.log | %__pear_install_log \
 \