rpms/synce/FC-3 synce.spec,1.4,1.5

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	synce.spec 
Log Message:
- reenable x86_64
- disable static libs



Index: synce.spec
===================================================================
RCS file: /cvs/extras/rpms/synce/FC-3/synce.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- synce.spec	20 Aug 2005 13:57:39 -0000	1.4
+++ synce.spec	20 Aug 2005 23:42:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           synce
 Version:        0.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial connection support for Pocket PC devices
 
 Group:          Applications/Communications
@@ -17,8 +17,6 @@
 
 Requires: ppp
 
-ExcludeArch: x86_64
-
 %description
 The purpose of the SynCE project is to provide a means of
 communication with a Windows CE device from a computer running Linux,
@@ -45,7 +43,7 @@
 %build
 # build libsynce
 cd synce-libsynce-%{version}
-%configure
+%configure --disable-static
 make
 SYNCEINC="$(pwd)/lib"
 SYNCELIB="$(pwd)/lib/.libs"
@@ -54,22 +52,27 @@
 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"
 cd ..
 # build libmimedir
 cd libmimedir-0.4
-%configure
+CFLAGS="$RPM_OPT_FLAGS -fPIC" %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 ..
@@ -81,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
@@ -98,6 +102,8 @@
     cd ..
 done
 
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -152,12 +158,15 @@
 %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 (#148003)
+- disable static libs
+
 * Sat Aug 20 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.1-1
 - beautify specfile