Author: glen Date: Tue May 30 18:56:53 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- specify gpg and gpgsm paths to avoid build dep just to get their path
- speedup development by rebuilding ac* only once when --short-circuit used
---- Files affected:
SPECS:
kdepim.spec (1.222.2.5 -> 1.222.2.6)
---- Diffs:
================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.222.2.5 SPECS/kdepim.spec:1.222.2.6
--- SPECS/kdepim.spec:1.222.2.5 Tue May 30 18:08:01 2006
+++ SPECS/kdepim.spec Tue May 30 20:56:48 2006
@@ -39,7 +39,6 @@
BuildRequires: ed
BuildRequires: flex
%{?with_hidden_visibility:BuildRequires: gcc-c++ >=
5:4.1.0-0.20051206r108118.1}
-BuildRequires: gnupg-agent
BuildRequires: gpgme-devel >= 1:1.0.0
%{?with_apidocs:BuildRequires: graphviz}
BuildRequires: kdelibs-devel >= %{_minlibsevr}
@@ -539,10 +538,15 @@
%{__sed} -i -e
's,\($HOME/\.annoyance-filter/annoyance-filter\)\(.*\),annoyance-filter\2,g' \
kmail/kmail.antispamrc
-%build
cp %{_datadir}/automake/config.sub admin
+rm -f configure
+
+%build
+# speedup
+if [ ! -f configure ]; then
+ %{__make} -f admin/Makefile.common cvs
+fi
-%{__make} -f admin/Makefile.common cvs
%configure \
--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
%{!?debug:--disable-rpath} \
@@ -552,6 +556,8 @@
%if "%{_lib}" == "lib64"
--enable-libsuffix=64 \
%endif
+ --with-gpg=/usr/bin/gpg \
+ --with-gpgsm=/usr/bin/gpgsm \
--enable-newdistrlists \
--with-distribution="PLD Linux Distribution" \
--with-qt-libraries=%{_libdir}
@@ -1383,6 +1389,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.222.2.6 2006/05/30 18:56:48 glen
+- specify gpg and gpgsm paths to avoid build dep just to get their path
+- speedup development by rebuilding ac* only once when --short-circuit used
+
Revision 1.222.2.5 2006/05/30 16:08:01 charles
- fix %prepare section
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.222.2.5&r2=1.222.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
