SPECS: kdelibs.spec, kdepim.spec - fix %prepare section
charles
charles at pld-linux.org
Tue May 30 18:12:30 CEST 2006
Author: charles Date: Tue May 30 16:12:30 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fix %prepare section
---- Files affected:
SPECS:
kdelibs.spec (1.460 -> 1.461) , kdepim.spec (1.225 -> 1.226)
---- Diffs:
================================================================
Index: SPECS/kdelibs.spec
diff -u SPECS/kdelibs.spec:1.460 SPECS/kdelibs.spec:1.461
--- SPECS/kdelibs.spec:1.460 Thu May 25 23:33:02 2006
+++ SPECS/kdelibs.spec Tue May 30 18:12:25 2006
@@ -348,14 +348,12 @@
%patch7 -p1
%patch8 -p0
+%build
cp %{_datadir}/automake/config.sub admin
-export kde_htmldir=%{_kdedocdir}
-export kde_libs_htmldir=%{_kdedocdir}
-%{__make} -f admin/Makefile.common cvs
-%build
export kde_htmldir=%{_kdedocdir}
export kde_libs_htmldir=%{_kdedocdir}
+%{__make} -f admin/Makefile.common cvs
CPPFLAGS="-I$(pwd)/kdecore/network"
%configure \
@@ -1009,6 +1007,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.461 2006/05/30 16:12:25 charles
+- fix %prepare section
+
Revision 1.460 2006/05/25 21:33:02 glen
- adapter
================================================================
Index: SPECS/kdepim.spec
diff -u SPECS/kdepim.spec:1.225 SPECS/kdepim.spec:1.226
--- SPECS/kdepim.spec:1.225 Mon May 29 17:02:35 2006
+++ SPECS/kdepim.spec Tue May 30 18:12:25 2006
@@ -538,11 +538,11 @@
# change annoyance-filter path (required by autodetect in kmail)
%{__sed} -i -e 's,\($HOME/\.annoyance-filter/annoyance-filter\)\(.*\),annoyance-filter\2,g' \
kmail/kmail.antispamrc
-cp %{_datadir}/automake/config.sub admin
-#export UNSERMAKE=%{_datadir}/unsermake/unsermake
-%{__make} -f admin/Makefile.common cvs
%build
+cp %{_datadir}/automake/config.sub admin
+
+%{__make} -f admin/Makefile.common cvs
%configure \
--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
%{!?debug:--disable-rpath} \
@@ -1383,6 +1383,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.226 2006/05/30 16:12:25 charles
+- fix %prepare section
+
Revision 1.225 2006/05/29 15:02:35 charles
- added -imapjob.patch (fixed crash if msg is 0)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kdelibs.spec?r1=1.460&r2=1.461&f=u
http://cvs.pld-linux.org/SPECS/kdepim.spec?r1=1.225&r2=1.226&f=u
More information about the pld-cvs-commit
mailing list