packages: kadu/kadu.spec - x86_64 fix modules installation - create _pixmapdir

cactus cactus at pld-linux.org
Sat May 9 13:31:44 CEST 2009


Author: cactus                       Date: Sat May  9 11:31:44 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- x86_64 fix modules installation
- create _pixmapdir

---- Files affected:
packages/kadu:
   kadu.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: packages/kadu/kadu.spec
diff -u packages/kadu/kadu.spec:1.208 packages/kadu/kadu.spec:1.209
--- packages/kadu/kadu.spec:1.208	Sat May  9 11:58:27 2009
+++ packages/kadu/kadu.spec	Sat May  9 13:31:38 2009
@@ -1137,6 +1137,12 @@
 tar xzf %{SOURCE34} -C varia/themes/icons
 tar xzf %{SOURCE41} -C varia/themes/icons
 
+# Drop this in 0.6.6 - fix modules install on x86_64
+%if "%{_lib}" == "lib64"
+%{__sed} -i 's/lib\/kadu\/modules/lib64\/kadu\/modules/' modules/*/CMakeLists.txt
+%{__sed} -i 's/lib\/kadu\/modules/lib64\/kadu\/modules/' modules/mime_tex/mimetex/CMakeLists.txt
+%endif
+
 # Change hard coded path to modules data files
 %{__sed} -i 's,dataPath("kadu/modules/*,("%{modules_data_dir}/,g' kadu-core/modules.cpp
 
@@ -1427,7 +1433,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -2142,6 +2148,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2009/05/09 11:31:38  cactus
+- x86_64 fix modules installation
+- create _pixmapdir
+
 Revision 1.208  2009/05/09 09:58:27  cactus
 - up to 0.6.5.2
 - updated gcc 4.4.0 patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kadu/kadu.spec?r1=1.208&r2=1.209&f=u



More information about the pld-cvs-commit mailing list