packages: mono/mono.spec - fix nls files build

[qboosh]

Author: qboosh                       Date: Sat Aug 14 18:09:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix nls files build

---- Files affected:
packages/mono:
   mono.spec (1.262 -> 1.263) 

---- Diffs:

================================================================
Index: packages/mono/mono.spec
diff -u packages/mono/mono.spec:1.262 packages/mono/mono.spec:1.263
--- packages/mono/mono.spec:1.262	Sat Aug 14 09:13:52 2010
+++ packages/mono/mono.spec	Sat Aug 14 20:09:41 2010
@@ -247,11 +247,14 @@
 CFLAGS = %{rpmcflags}
 EOF
 
+mkdir m4
+ln -sf ../{nls,po,progtest}.m4 m4
+
 %build
 cp -f /usr/share/automake/config.sub .
 cp -f /usr/share/automake/config.sub libgc
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoheader}
 %{__autoconf}
 %{__automake}
@@ -284,9 +287,9 @@
 # there is mprotect(...,PROT_EXEC) for ppc/s390, but not used
 # (ifdef NEED_MPROTECT, which is never defined)
 # in fact the flag should be "-Wl,-z,execheap" for libmint, but:
-# -z execheap doesn't seem to do anything currently
-# -z execstack for library makes only stack executable, but not heap
-# V=1 because --disable-silent-rules doesn't work
+# -z execheap doesn't seem to do anything currently;
+# -z execstack for library makes only stack executable, but not heap.
+# V=1 because --disable-silent-rules doesn't work.
 %{__make} -j1 \
 	V=1 \
 	mint_LDFLAGS="-Wl,-z,execheap -Wl,-z,execstack"
@@ -300,7 +303,7 @@
 
 strip --strip-debug $RPM_BUILD_ROOT%{_bindir}/mono
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/jay/[A-Z]*
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/jay/[A-Z]*
 
 # this way we can run rpmbuild -bi several times, and directories
 # have more meaningful name.
@@ -315,9 +318,9 @@
 mv -f $RPM_BUILD_ROOT%{_bindir}/mono-find-* $RPM_BUILD_ROOT%{_rpmlibdir}
 
 # loadable modules
-rm $RPM_BUILD_ROOT%{_libdir}/lib{MonoPosixHelper,MonoSupportW,ikvm-native}.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{MonoPosixHelper,MonoSupportW,ikvm-native}.la
 %if %{with static_libs}
-rm $RPM_BUILD_ROOT%{_libdir}/lib{MonoPosixHelper,MonoSupportW,ikvm-native}.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{MonoPosixHelper,MonoSupportW,ikvm-native}.a
 %endif
 
 %clean
@@ -758,6 +761,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.263  2010/08/14 18:09:41  qboosh
+- fix nls files build
+
 Revision 1.262  2010/08/14 07:13:52  qboosh
 - pass V=1 to make (--disable-silent-rules for configure doesn't work)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mono/mono.spec?r1=1.262&r2=1.263&f=u