rpms/synce/FC-4 synce.spec,1.6,1.7

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/synce/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11818

Modified Files:
	synce.spec 
Log Message:
- more x86_64 build fixes



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/FC-4/synce.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- synce.spec	20 Aug 2005 22:34:25 -0000	1.6
+++ synce.spec	20 Aug 2005 23:11:26 -0000	1.7
@@ -43,7 +43,7 @@
 %build
 # build libsynce
 cd synce-libsynce-%{version}
-%configure
+%configure --disable-static
 make
 SYNCEINC="$(pwd)/lib"
 SYNCELIB="$(pwd)/lib/.libs"
@@ -52,14 +52,16 @@
 cd synce-dccm-%{version}
 %configure \
     --with-libsynce-include="${SYNCEINC}" \
-    --with-libsynce-lib="${SYNCELIB}"
+    --with-libsynce-lib="${SYNCELIB}" \
+    --disable-static
 make LDFLAGS="-L${SYNCEINC}"
 cd ..
 # build librapi2
 cd synce-librapi2-%{version}
 %configure \
     --with-libsynce-include="${SYNCEINC}" \
-    --with-libsynce-lib="${SYNCELIB}"
+    --with-libsynce-lib="${SYNCELIB}" \
+    --disable-static
 make LDFLAGS="-L${SYNCEINC}"
 RAPI2INC="$(pwd)/src"
 RAPI2LIB="$(pwd)/src/.libs"
@@ -68,6 +70,9 @@
 cd libmimedir-0.4
 %configure
 make
+# build shared libmimedir to work around x86_64 build error
+ld --shared --whole-archive libmimedir.a -o libmimedir.so
+rm libmimedir.a
 MIMEDIRINC="$(pwd)"
 MIMEDIRLIB="$(pwd)"
 cd ..
@@ -79,7 +84,8 @@
     --with-librapi2-include="${RAPI2INC}" \
     --with-librapi2-lib="${RAPI2LIB}" \
     --with-libmimedir-include="${MIMEDIRINC}" \
-    --with-libmimedir-lib="${MIMEDIRLIB}"
+    --with-libmimedir-lib="${MIMEDIRLIB}" \
+    --disable-static
 make LDFLAGS="-L${SYNCEINC} -L${RAPI2INC} -L${MIMEDIRLIB}"
 cd ..
 # build the serial support
@@ -96,6 +102,8 @@
     cd ..
 done
 
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -150,15 +158,14 @@
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*.h
-%{_libdir}/lib*.a
-%{_libdir}/lib*.la
 %{_libdir}/lib*.so
 %{_datadir}/aclocal/*.m4
 
 %changelog
 * Sun Aug 21 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.1-2
-- reenable x86_64
+- reenable x86_64 (#148003)
+- disable static libs
 
 * Sat Aug 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.1-1