From 7f82b73078d6a646ca7ea08587f3829ec90897fb Mon Sep 17 00:00:00 2001 From: Paul F. Johnson Date: Dec 17 2008 12:36:49 +0000 Subject: SVN update Fix monodoc issue (x86_64) --- diff --git a/.cvsignore b/.cvsignore index bc0d47b..ecb4b04 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mono-121605.tar.bz2 +mono-121664.tar.bz2 diff --git a/import.log b/import.log index da21df8..84fc3ce 100644 --- a/import.log +++ b/import.log @@ -22,3 +22,4 @@ mono-2_2-8_pre2_fc11:HEAD:mono-2.2-8.pre2.fc11.src.rpm:1228759110 mono-2_2-10_pre2_20081215svn121507_fc11:HEAD:mono-2.2-10.pre2.20081215svn121507.fc11.src.rpm:1229342187 mono-2_2-11_pre3_20081215svn121536_fc11:HEAD:mono-2.2-11.pre3.20081215svn121536.fc11.src.rpm:1229380660 mono-2_2-11_pre3_20081216svn121605_fc11:HEAD:mono-2.2-11.pre3.20081216svn121605.fc11.src.rpm:1229509237 +mono-2_2-12_pre3_20081217svn121664_fc11:HEAD:mono-2.2-12.pre3.20081217svn121664.fc11.src.rpm:1229517354 diff --git a/mono.spec b/mono.spec index faf0194..c6662f9 100644 --- a/mono.spec +++ b/mono.spec @@ -1,8 +1,8 @@ -%define svnver 121605 +%define svnver 121664 Name: mono Version: 2.2 -Release: 11.pre3.20081216svn%{svnver}%{?dist} +Release: 12.pre3.20081217svn%{svnver}%{?dist} Summary: A .NET runtime environment Group: Development/Languages @@ -286,6 +286,8 @@ sed -i -e 's!@libdir@!%{_libdir}!' %{PATCH7} %patch7 -p1 -b .libdir-22 sed -i -e 's!%{_libdir}!@libdir@!' %{PATCH7} sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions_1.0.pc.in +sed -i -e 's!@prefix@/lib/!%{_libdir}/!' data/system.web.extensions.design_1.0.pc.in +sed -i -e 's!$(prefix)/lib/!%{_libdir}/!' docs/Makefile.{am,in} autoreconf -f -i -s @@ -627,6 +629,7 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %files web-devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/system.web.extensions_1.0.pc +%{_libdir}/pkgconfig/system.web.extensions.design_1.0.pc %files data %defattr(-,root,root,-) @@ -692,6 +695,9 @@ install monodir $RPM_BUILD_ROOT%{_bindir} %{_libdir}/pkgconfig/monodoc.pc %changelog +* Wed Dec 17 2008 Paul F. Johnson 2.2-12.pre3.20081217svn121664 +- Fix libdir issue with monodoc + * Tue Dec 16 2008 Paul F. Johnson 2.2-11.pre3.20081216svn121605 - Fixes problems with web references - Fixes x86_64 build problems diff --git a/sources b/sources index dece67b..c7ef950 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b6036357e35282ee2d69076d8e89eec mono-121605.tar.bz2 +eb038c4b7f0cd5da9711693b58d8018b mono-121664.tar.bz2