[taoframework] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org

[Christian Krause]

commit 5dc18e2c18533537cb5d3e9f8ab394fe56bfa536
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Sat Nov 12 10:33:45 2011 +0100

    Change paths for mono assemblies according to updated packaging
    guidelines (http://fedoraproject.org/wiki/Packaging:Mono)

 taoframework-2.1.0-libdir.patch |  101 -----------------------------
 taoframework.spec               |  134 ++++++++++++++++++++-------------------
 2 files changed, 68 insertions(+), 167 deletions(-)
---
diff --git a/taoframework.spec b/taoframework.spec
index 9183737..267cee5 100644
--- a/taoframework.spec
+++ b/taoframework.spec
@@ -7,15 +7,13 @@ media application development.
 Summary: Multimedia bindings for Mono
 Name: taoframework
 Version: 2.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MIT
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://www.taoframework.com/
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-#fix libdir patch created by sourcefucker, submitted upstream
-Patch0: taoframework-2.1.0-libdir.patch
 # Don't build the tests or examples
 Patch1: disable-tests.patch
 # doc command don't work properly on mono >= 2.0, submitted upstream
@@ -270,11 +268,10 @@ This package contains MonoDoc documentation files.
 %prep
 %setup -q
 
-%patch0 -p1 -b .libdir
 %patch1 -b .disable-tests
 %patch2 -b .fix-docs
 %patch3 -p1 -b .fix-dll-maps
-%patch4 -p1 -b .fix-makefile
+%patch4 -p1 -F 2 -b .fix-makefile
 
 find -name '*.dll' -exec rm -f {} \;
 find -name '*.exe' -exec rm -f {} \;
@@ -282,7 +279,7 @@ find -name '*.exe' -exec rm -f {} \;
 %build
 pushd source
 autoreconf -f -i
-%configure --libdir=%{_libdir}
+%configure --libdir=%{_prefix}/lib
 #parallel build doesn't work
 make
 popd
@@ -292,11 +289,12 @@ rm -rf %{buildroot}
 pushd source
 make install DESTDIR=%{buildroot}
 popd
-rm -rf %{buildroot}%{_libdir}/mono/tao-platform-windows*
-rm -rf %{buildroot}%{_libdir}/mono/gac/Tao.Platform.Windows
-rm -rf %{buildroot}%{_libdir}/pkgconfig/tao-platform-windows*
-mkdir %{buildroot}%{_datadir}
-mv %{buildroot}%{_libdir}/pkgconfig %{buildroot}%{_datadir}/
+rm -rf %{buildroot}%{_prefix}/lib/mono/tao-platform-windows*
+rm -rf %{buildroot}%{_prefix}/lib/mono/gac/Tao.Platform.Windows
+rm -rf %{buildroot}%{_prefix}/lib/pkgconfig/tao-platform-windows*
+
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+test "%{_libdir}" = "%{_prefix}/lib" || mv $RPM_BUILD_ROOT/%{_prefix}/lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
 %clean
 rm -rf %{buildroot}
@@ -305,147 +303,151 @@ rm -rf %{buildroot}
 
 %files opengl
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-opengl-2.1
-%{_libdir}/mono/tao-platform-x11-1.0
-%{_libdir}/mono/gac/Tao.OpenGl
-%{_libdir}/mono/gac/Tao.Platform.X11
+%{_prefix}/lib/mono/tao-opengl-2.1
+%{_prefix}/lib/mono/tao-platform-x11-1.0
+%{_prefix}/lib/mono/gac/Tao.OpenGl
+%{_prefix}/lib/mono/gac/Tao.Platform.X11
 
 %files opengl-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-opengl.pc
-%{_datadir}/pkgconfig/tao-opengl-2.1.pc
-%{_datadir}/pkgconfig/tao-platform-x11.pc
-%{_datadir}/pkgconfig/tao-platform-x11-1.0.pc
+%{_libdir}/pkgconfig/tao-opengl.pc
+%{_libdir}/pkgconfig/tao-opengl-2.1.pc
+%{_libdir}/pkgconfig/tao-platform-x11.pc
+%{_libdir}/pkgconfig/tao-platform-x11-1.0.pc
 
 
 %files openal
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-openal-1.1
-%{_libdir}/mono/gac/Tao.OpenAl
+%{_prefix}/lib/mono/tao-openal-1.1
+%{_prefix}/lib/mono/gac/Tao.OpenAl
 
 %files openal-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-openal.pc
-%{_datadir}/pkgconfig/tao-openal-1.1.pc
+%{_libdir}/pkgconfig/tao-openal.pc
+%{_libdir}/pkgconfig/tao-openal-1.1.pc
 
 
 %files freeglut
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-freeglut-2.4
-%{_libdir}/mono/gac/Tao.FreeGlut
+%{_prefix}/lib/mono/tao-freeglut-2.4
+%{_prefix}/lib/mono/gac/Tao.FreeGlut
 
 %files freeglut-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-freeglut.pc
-%{_datadir}/pkgconfig/tao-freeglut-2.4.pc
+%{_libdir}/pkgconfig/tao-freeglut.pc
+%{_libdir}/pkgconfig/tao-freeglut-2.4.pc
 
 
 %files devil
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-devil-1.6
-%{_libdir}/mono/gac/Tao.DevIl
+%{_prefix}/lib/mono/tao-devil-1.6
+%{_prefix}/lib/mono/gac/Tao.DevIl
 
 %files devil-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-devil.pc
-%{_datadir}/pkgconfig/tao-devil-1.6.pc
+%{_libdir}/pkgconfig/tao-devil.pc
+%{_libdir}/pkgconfig/tao-devil-1.6.pc
 
 
 #%files ffmpeg
 #%defattr(-,root,root,-)
-#%{_libdir}/mono/tao-ffmpeg-0.4
-#%{_libdir}/mono/gac/Tao.FFmpeg
+#%{_prefix}/lib/mono/tao-ffmpeg-0.4
+#%{_prefix}/lib/mono/gac/Tao.FFmpeg
 
 #%files ffmpeg-devel
 #%defattr(-,root,root,-)
-#%{_datadir}/pkgconfig/tao-ffmpeg.pc
-#%{_datadir}/pkgconfig/tao-ffmpeg-0.4.pc
+#%{_libdir}/pkgconfig/tao-ffmpeg.pc
+#%{_libdir}/pkgconfig/tao-ffmpeg-0.4.pc
 
 
 %files lua
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-lua-5.1
-%{_libdir}/mono/gac/Tao.Lua
+%{_prefix}/lib/mono/tao-lua-5.1
+%{_prefix}/lib/mono/gac/Tao.Lua
 
 %files lua-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-lua.pc
-%{_datadir}/pkgconfig/tao-lua-5.1.pc
+%{_libdir}/pkgconfig/tao-lua.pc
+%{_libdir}/pkgconfig/tao-lua-5.1.pc
 
 
 %files ode
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-ode-0.9
-%{_libdir}/mono/gac/Tao.Ode
+%{_prefix}/lib/mono/tao-ode-0.9
+%{_prefix}/lib/mono/gac/Tao.Ode
 
 %files ode-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-ode.pc
-%{_datadir}/pkgconfig/tao-ode-0.9.pc
+%{_libdir}/pkgconfig/tao-ode.pc
+%{_libdir}/pkgconfig/tao-ode-0.9.pc
 
 
 %files physfs
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-physfs-1.0
-%{_libdir}/mono/gac/Tao.PhysFs
+%{_prefix}/lib/mono/tao-physfs-1.0
+%{_prefix}/lib/mono/gac/Tao.PhysFs
 
 %files physfs-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-physfs.pc
-%{_datadir}/pkgconfig/tao-physfs-1.0.pc
+%{_libdir}/pkgconfig/tao-physfs.pc
+%{_libdir}/pkgconfig/tao-physfs-1.0.pc
 
 
 #%files sdl
 #%defattr(-,root,root,-)
-#%{_libdir}/mono/tao-sdl-1.2
-#%{_libdir}/mono/gac/Tao.Sdl
+#%{_prefix}/lib/mono/tao-sdl-1.2
+#%{_prefix}/lib/mono/gac/Tao.Sdl
 
 #%files sdl-devel
 #%defattr(-,root,root,-)
-#%{_datadir}/pkgconfig/tao-sdl.pc
-#%{_datadir}/pkgconfig/tao-sdl-1.2.pc
+#%{_libdir}/pkgconfig/tao-sdl.pc
+#%{_libdir}/pkgconfig/tao-sdl-1.2.pc
 
 
 %files freetype
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-freetype-2.3
-%{_libdir}/mono/gac/Tao.FreeType
+%{_prefix}/lib/mono/tao-freetype-2.3
+%{_prefix}/lib/mono/gac/Tao.FreeType
 
 %files freetype-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-freetype.pc
-%{_datadir}/pkgconfig/tao-freetype-2.3.pc
+%{_libdir}/pkgconfig/tao-freetype.pc
+%{_libdir}/pkgconfig/tao-freetype-2.3.pc
 
 
 #%files cg
 #%defattr(-,root,root,-)
-#%{_libdir}/mono/tao-cg-2.0
-#%{_libdir}/mono/gac/Tao.Cg
+#%{_prefix}/lib/mono/tao-cg-2.0
+#%{_prefix}/lib/mono/gac/Tao.Cg
 
 #%files cg-devel
 #%defattr(-,root,root,-)
-#%{_datadir}/pkgconfig/tao-cg.pc
-#%{_datadir}/pkgconfig/tao-cg-2.0.pc
+#%{_libdir}/pkgconfig/tao-cg.pc
+#%{_libdir}/pkgconfig/tao-cg-2.0.pc
 
 
 %files glfw
 %defattr(-,root,root,-)
-%{_libdir}/mono/tao-glfw-2.6
-%{_libdir}/mono/gac/Tao.Glfw
+%{_prefix}/lib/mono/tao-glfw-2.6
+%{_prefix}/lib/mono/gac/Tao.Glfw
 
 %files glfw-devel
 %defattr(-,root,root,-)
-%{_datadir}/pkgconfig/tao-glfw.pc
-%{_datadir}/pkgconfig/tao-glfw-2.6.pc
+%{_libdir}/pkgconfig/tao-glfw.pc
+%{_libdir}/pkgconfig/tao-glfw-2.6.pc
 
 
 %files doc
 %defattr(-,root,root,-)
-%{_libdir}/monodoc/sources/Tao.source
-%{_libdir}/monodoc/sources/Tao.tree
-%{_libdir}/monodoc/sources/Tao.zip
+%{_prefix}/lib/monodoc/sources/Tao.source
+%{_prefix}/lib/monodoc/sources/Tao.tree
+%{_prefix}/lib/monodoc/sources/Tao.zip
 
 %changelog
+* Sat Nov 12 2011 Christian Krause <chkr at fedoraproject.org> - 2.1.0-5
+- Change paths for mono assemblies according to updated packaging
+  guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
 * Fri Oct 21 2011 Dan Horák <dan[at]danny.cz> - 2.1.0-4
 - update the supported arch list