Author: glen Date: Mon Nov 7 14:40:25 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- restore install timestamps shortcuts
---- Files affected:
packages/libreoffice:
libreoffice.spec (1.910 -> 1.911)
---- Diffs:
================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.910
packages/libreoffice/libreoffice.spec:1.911
--- packages/libreoffice/libreoffice.spec:1.910 Sat Nov 5 09:54:11 2011
+++ packages/libreoffice/libreoffice.spec Mon Nov 7 15:40:20 2011
@@ -12,7 +12,7 @@
%bcond_without kde4 # KDE4 L&F packages
%bcond_with mono # enable compilation of mono bindings
%bcond_without mozilla # without mozilla components
-%bcond_without i18n # do not create i18n packages
+%bcond_without i18n # do not create i18n packages (extra build time)
%bcond_with ccache # use ccache to speed up builds
%bcond_with icecream # use icecream to speed up builds
%bcond_with msaccess # with ms access import pieces
@@ -2635,9 +2635,25 @@
fi
%install
+# install just once (based on makeinstall.stamp)
+# this will make packaging newer versions simplier
+if [ ! -f makeinstall.stamp -o ! -d $RPM_BUILD_ROOT ]; then
+ rm -rf makeinstall.stamp installed.stamp $RPM_BUILD_ROOT
+
+ %{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
+
+ # save orignal install layout
+ find $RPM_BUILD_ROOT -ls > ls.txt
+ touch makeinstall.stamp
+fi
+
+# mangle files installed in build root
+if [ ! -f installed.stamp ]; then
+ chmod -Rf a+rX,u+w,g-w,o-w $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+ touch installed.stamp
+fi
# Find out locales
find_lang() {
@@ -4038,6 +4054,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.911 2011/11/07 14:40:20 glen
+- restore install timestamps shortcuts
+
Revision 1.910 2011/11/05 08:54:11 arekm
- builds but install and files needs work
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.910&r2=1.911&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
