packages: mono-addins/mono-addins.spec - drop -pkglibdir64.patch (breaks pa...

[megabajt]

Author: megabajt                     Date: Mon Jun  8 19:13:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop -pkglibdir64.patch (breaks paths in pkgconfig files)
- Th uses %{_prefix}/lib on x86_64 as well
- release 3

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

---- Diffs:

================================================================
Index: packages/mono-addins/mono-addins.spec
diff -u packages/mono-addins/mono-addins.spec:1.10 packages/mono-addins/mono-addins.spec:1.11
--- packages/mono-addins/mono-addins.spec:1.10	Sat May 16 21:41:10 2009
+++ packages/mono-addins/mono-addins.spec	Mon Jun  8 21:13:02 2009
@@ -4,21 +4,17 @@
 Summary(pl.UTF-8):	Mono.Addins - framework do tworzenia elastycznych aplikacji i bibliotek
 Name:		mono-addins
 Version:	0.4
-Release:	2
+Release:	3
 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}-pkglibdir64.patch
-Patch1:		%{name}-pkglibdir.patch
+Patch0:		%{name}-pkglibdir.patch
 URL:		http://www.mono-project.com/Mono.Addins
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	dotnet-gtk-sharp2-devel >= 2.9.0
-BuildRequires:	gettext-devel
-BuildRequires:	intltool
-BuildRequires:	libtool
 BuildRequires:	mono-csharp >= 1.1.13
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -52,20 +48,13 @@
 
 %prep
 %setup -q
-%ifarch %{x8664}
 %patch0 -p1
-%else
-%patch1 -p1
-%endif
 
 %build
-rm -rf autom4te.cache
-%{__libtoolize}
 %{__aclocal}
 %{__automake}
 %{__autoconf}
 %configure
-
 %{__make} -j1
 
 %install
@@ -81,7 +70,6 @@
 %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
@@ -97,38 +85,14 @@
 %{_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
-%{_libdir}/mono/gac/Mono.Addins
-%{_libdir}/mono/gac/Mono.Addins.Gui
-%{_libdir}/mono/gac/Mono.Addins.Setup
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.Gui
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.Setup
-%{_libdir}/mono/gac/Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.2.Mono.Addins.CecilReflector
-%{_libdir}/mono/gac/policy.0.3.Mono.Addins.Gui
-%{_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
@@ -139,6 +103,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/06/08 19:13:02  megabajt
+- drop -pkglibdir64.patch (breaks paths in pkgconfig files)
+- Th uses %{_prefix}/lib on x86_64 as well
+- release 3
+
 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
================================================================

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