packages: mono-addins/mono-addins.spec - added -pkglibdir64.patch for x86_6...

hawk hawk at pld-linux.org
Sat May 16 21:41:16 CEST 2009


Author: hawk                         Date: Sat May 16 19:41:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added -pkglibdir64.patch for x86_64
- there is no /usr/lib64/mono in Titanium, switch back to /usr/lib on x86_64

---- Files affected:
packages/mono-addins:
   mono-addins.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/mono-addins/mono-addins.spec
diff -u packages/mono-addins/mono-addins.spec:1.9 packages/mono-addins/mono-addins.spec:1.10
--- packages/mono-addins/mono-addins.spec:1.9	Thu Mar 26 11:01:49 2009
+++ packages/mono-addins/mono-addins.spec	Sat May 16 21:41:10 2009
@@ -4,13 +4,14 @@
 Summary(pl.UTF-8):	Mono.Addins - framework do tworzenia elastycznych aplikacji i bibliotek
 Name:		mono-addins
 Version:	0.4
-Release:	1
+Release:	2
 License:	GPL/MIT
 Group:		Development/Tools
 # latest downloads summary at http://ftp.novell.com/pub/mono/sources-stable/
 Source0:	http://ftp.novell.com/pub/mono/sources/mono-addins/%{name}-%{version}.tar.bz2
 # Source0-md5:	3b7f3f6e55c95413df184d0e4c9233e4
-Patch0:		%{name}-pkglibdir.patch
+Patch0:		%{name}-pkglibdir64.patch
+Patch1:		%{name}-pkglibdir.patch
 URL:		http://www.mono-project.com/Mono.Addins
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1:1.7
@@ -51,7 +52,11 @@
 
 %prep
 %setup -q
+%ifarch %{x8664}
 %patch0 -p1
+%else
+%patch1 -p1
+%endif
 
 %build
 rm -rf autom4te.cache
@@ -76,6 +81,23 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/mautil
+%if "%{pld_release}" == "ti"
+%dir %{_prefix}/lib/mono/mono-addins
+%{_prefix}/lib/mono/mono-addins/mautil.exe
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.CecilReflector.dll
+%{_prefix}/lib/mono/gac/Mono.Addins
+%{_prefix}/lib/mono/gac/Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.Setup
+%{_prefix}/lib/mono/gac/Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.2.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.Gui
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.CecilReflector
+%{_prefix}/lib/mono/gac/policy.0.3.Mono.Addins.Setup
+%else
 %dir %{_libdir}/mono/mono-addins
 %{_libdir}/mono/mono-addins/mautil.exe
 %{_libdir}/mono/mono-addins/Mono.Addins.CecilReflector.dll
@@ -91,14 +113,22 @@
 %{_libdir}/mono/gac/policy.0.3.Mono.Addins
 %{_libdir}/mono/gac/policy.0.3.Mono.Addins.CecilReflector
 %{_libdir}/mono/gac/policy.0.3.Mono.Addins.Setup
+%endif
 %{_mandir}/man1/mautil.1*
 
 %files devel
 %defattr(644,root,root,755)
+%if "%{pld_release}" == "ti"
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.dll
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.Gui.dll
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.Setup.dll
+%{_prefix}/lib/mono/mono-addins/Mono.Addins.CecilReflector.dll
+%else
 %{_libdir}/mono/mono-addins/Mono.Addins.dll
 %{_libdir}/mono/mono-addins/Mono.Addins.Gui.dll
 %{_libdir}/mono/mono-addins/Mono.Addins.Setup.dll
 %{_libdir}/mono/mono-addins/Mono.Addins.CecilReflector.dll
+%endif
 %{_pkgconfigdir}/mono-addins.pc
 %{_pkgconfigdir}/mono-addins-gui.pc
 %{_pkgconfigdir}/mono-addins-setup.pc
@@ -109,6 +139,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/05/16 19:41:10  hawk
+- added -pkglibdir64.patch for x86_64
+- there is no /usr/lib64/mono in Titanium, switch back to /usr/lib on x86_64
+
 Revision 1.9  2009/03/26 10:01:49  vip
 - up to 0.4
 - force make -j1 (build failed on -j4)
================================================================

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



More information about the pld-cvs-commit mailing list