rpms/syncevolution/devel syncevolution.spec,1.12,1.13

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16973

Modified Files:
	syncevolution.spec 
Log Message:
- fixing autoconfigury; now it fails in a later stage of build


Index: syncevolution.spec
===================================================================
RCS file: /cvs/extras/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- syncevolution.spec	5 Aug 2009 11:11:39 -0000	1.12
+++ syncevolution.spec	5 Aug 2009 13:15:10 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: SyncML client for evolution
 Name: syncevolution
 Version: 0.8.1+0.9+beta3+20090723
-Release: 1.0.1%{?dist}
+Release: 1.0.2%{?dist}
 License: LGPLv2+
 Group: Applications/Productivity
 URL: http://syncevolution.org/
@@ -35,18 +35,19 @@ Files for development with %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .Fedora-build
+# use the ac macros in Makefile.am
+sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
+touch -r Makefile-gen.am Makefile.am
 
 %build
-aclocal --force
-libtoolize --copy --force --automake
 intltoolize --automake --copy --force
-autoconf --force
-automake --copy --add-missing
+autoreconf -fiv
+(cd src/synthesis && mkdir m4 && autoreconf -fi)
 %configure --enable-unit-tests --enable-libsoup  \
     --enable-dbus-service --enable-shared --with-expat=system \
     --disable-static
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
+	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
@@ -57,8 +58,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/te
 #rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
 
 #Remove libtool archives and static libs
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name '*.a' -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -o -name '*.a' | xargs rm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -86,6 +86,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/syncevolution/*so
 
 %changelog
+* Wed Aug  5 2009 Stepan Kasal <skasal at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.2
+- fixing autoconfigury; now it fails in a later stage of build ;-)
+
 * Wed Aug  5 2009 Matěj Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.1
 - fixing rpath, currently FTBFS!!!