SPECS: mono-tools.spec - fixed some lib64 issues - ilcontrast depe...

qboosh qboosh at pld-linux.org
Wed May 16 21:35:04 CEST 2007


Author: qboosh                       Date: Wed May 16 19:35:04 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fixed some lib64 issues
- ilcontrast depends on gecko, so moved to -gecko package

---- Files affected:
SPECS:
   mono-tools.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/mono-tools.spec
diff -u SPECS/mono-tools.spec:1.29 SPECS/mono-tools.spec:1.30
--- SPECS/mono-tools.spec:1.29	Wed May 16 21:24:21 2007
+++ SPECS/mono-tools.spec	Wed May 16 21:34:59 2007
@@ -23,6 +23,7 @@
 BuildRequires:	monodoc >= 1.1.16
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(monoautodeps)
+BuildRequires:	sed >= 4.0
 Requires:	mono-tools-html-renderer
 ExcludeArch:	i386
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -66,6 +67,9 @@
 %prep
 %setup -q
 
+# as expected by ilcontrast script
+sed -i -e 's,\$(libdir)/ilcontrast,$(prefix)/lib/ilcontrast,' ilcontrast/Makefile.am
+
 %build
 %{__aclocal}
 %{__autoconf}
@@ -78,7 +82,6 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	assemblydir=%{_libdir}/create-native-map \
 	monodocdir=%{_libdir}/monodoc \
 	pkgconfigdir=%{_pkgconfigdir}
 
@@ -94,11 +97,9 @@
 %attr(755,root,root) %{_bindir}/gasnview
 %attr(755,root,root) %{_bindir}/gnunit
 %attr(755,root,root) %{_bindir}/gnunit2
-%attr(755,root,root) %{_bindir}/ilcontrast
 %{_prefix}/lib/mono/1.0/*
 %{_prefix}/lib/mono/2.0/*
-%{_libdir}/create-native-map
-%{_libdir}/ilcontrast
+%{_prefix}/lib/create-native-map
 %{_libdir}/monodoc/browser.exe
 %{_desktopdir}/*.desktop
 %{_pixmapsdir}/*
@@ -108,6 +109,8 @@
 %if %{with gecko}
 %files gecko
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ilcontrast
+%{_prefix}/lib/ilcontrast
 %{_libdir}/monodoc/GeckoHtmlRender.dll
 %endif
 
@@ -121,6 +124,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30  2007/05/16 19:34:59  qboosh
+- fixed some lib64 issues
+- ilcontrast depends on gecko, so moved to -gecko package
+
 Revision 1.29  2007/05/16 19:24:21  qboosh
 - updated to 1.2.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mono-tools.spec?r1=1.29&r2=1.30&f=u



More information about the pld-cvs-commit mailing list