[libmatecomponent/f18] add provide libmatecomponent-activation for future mate apps

[Wolfgang Ulbrich]

commit 61525a9a25a76b9bbfa5900734859e5532fb8979
Author: raveit65 <chat-to-me at raveit.de>
Date:   Tue Aug 14 13:15:51 2012 +0200

    add provide libmatecomponent-activation for future mate apps

 libmatecomponent-multishlib.patch |   20 +++++++++++
 libmatecomponent.spec             |   65 +++++++++++++++++++++++++-----------
 2 files changed, 65 insertions(+), 20 deletions(-)
---
diff --git a/libmatecomponent-multishlib.patch b/libmatecomponent-multishlib.patch
new file mode 100644
index 0000000..28d76aa
--- /dev/null
+++ b/libmatecomponent-multishlib.patch
@@ -0,0 +1,20 @@
+diff -up libmatecomponent-1.4.0/activation-server/Makefile.am.multishlib libmatecomponent-1.4.0/activation-server/Makefile.am
+--- libmatecomponent-1.4.0/activation-server/Makefile.am.multishlib	2007-01-01 18:46:55.000000000 -0500
++++ libmatecomponent-1.4.0/activation-server/Makefile.am	2008-08-22 20:23:53.000000000 -0400
+@@ -6,13 +6,15 @@ bin_PROGRAMS=activation-client
+ libexec_PROGRAMS=matecomponent-activation-server
+ noinst_PROGRAMS=test-performance
+ 
++serverinfolibdir = $(libdir)/matecomponent/servers:$(exec_prefix)/lib/matecomponent/servers
++
+ INCLUDES=					\
+ 	-I$(top_srcdir) 			\
+ 	-I$(top_builddir) 			\
+ 	-I$(top_builddir)/matecomponent-activation	\
+ 	-I$(top_srcdir)/matecomponent-activation	\
+ 	-DPREFIX=\""$(prefix)"\"		\
+-	-DSERVERINFODIR=\"$(libdir)/matecomponent/servers\" \
++	-DSERVERINFODIR=\"$(serverinfolibdir)\" \
+         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
+ 	$(SERVER_CFLAGS)			\
+ 	$(WARN_CFLAGS)				\
diff --git a/libmatecomponent.spec b/libmatecomponent.spec
index e3e9087..17ca2d2 100644
--- a/libmatecomponent.spec
+++ b/libmatecomponent.spec
@@ -1,51 +1,60 @@
 Name:	libmatecomponent
 Version:	1.4.0
-Release:	8%{?dist}
+Release:	11%{?dist}
 Summary:	Libraries for matecomponent package of MATE-Desktop
-Group:		System Environment/Libraries
 License:	LGPLv2+ and GPLv2+
-URL:		http://vicodan.fedorapeople.org
+URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
 BuildRequires:	byacc flex libxml2-devel mate-common mate-corba-devel popt-devel
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
+Provides:	libmatecomponent-activation%{?_isa} = %{version}-%{release}
+
+Patch0:		libmatecomponent-multishlib.patch
+
 %description
 Libraries for matecomponent package of MATE-Desktop
 
 %package libs
 Summary:	Shared libraries for libmatecomponent
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
 
 %description libs
 Shared libraries for libmatecomponent
 
 %package devel
 Summary:	Development libraries for libmatecomponent
-Requires:	%{name}%{?_isa} = %{version}-%{release}
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
+Provides: 	libmatecomponent-activation-devel%{?_isa} = %{version}-%{release}
 
 %description devel
 Development libraries and includes for libmatecomponent.
 
 %prep
 %setup -q
+%patch0 -p1 -b .multishlib
+NOCONFIGURE=1 ./autogen.sh
 
 %build
-NOCONFIGURE=1 ./autogen.sh
 %configure --disable-static
 make %{?_smp_mflags} V=1
 
 
 %install
 make install DESTDIR=%{buildroot}
-%find_lang %{name}
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
+for serverfile in $RPM_BUILD_ROOT%{_libdir}/matecomponent/servers/*.server; do
+    sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
+done
+
+#required for multilib installs /usr/lib/matecomponent/servers
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/matecomponent/servers
+
+%find_lang %{name}
 
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
@@ -59,11 +68,9 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %{_bindir}/matecomponent-slay
 %{_sbindir}/matecomponent-activation-sysconf
 %{_libexecdir}/matecomponent-activation-server
-%{_datadir}/gtk-doc/html/libmatecomponent/
-%{_datadir}/gtk-doc/html/matecomponent-activation/*
 %{_datadir}/man/man1/*
-%{_datadir}/idl/matecomponent-2.0/*
-%{_datadir}/idl/matecomponent-activation-2.0/*
+%{_datadir}/idl/matecomponent-2.0/
+%{_datadir}/idl/matecomponent-activation-2.0/
 
 %files devel
 %{_libdir}/libmatecomponent-2.so
@@ -71,21 +78,39 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';'
 %{_libdir}/pkgconfig/matecomponent-activation-2.0.pc
 %{_libdir}/libmatecomponent-activation.so
 %{_includedir}/libmatecomponent-2.0/
-%{_includedir}/matecomponent-activation-2.0/*
+%{_includedir}/matecomponent-activation-2.0/
+%{_datadir}/gtk-doc/html/libmatecomponent/
+%{_datadir}/gtk-doc/html/matecomponent-activation/
 
 %files libs
 %{_libdir}/libmatecomponent-2.so.0*
 %{_libdir}/libmatecomponent-activation.so.4*
-%{_libdir}/matecomponent-2.0/samples/matecomponent-echo-2
-%{_libdir}/matecomponent/monikers/libmoniker_std_2.so
-%{_libdir}/matecomponent/servers/MateComponent_CosNaming_NamingContext.server
-%{_libdir}/matecomponent/servers/MateComponent_Moniker_std.server
-%{_libdir}/matecomponent/servers/MateComponent_Sample_Echo.server
+# consider moving these to main package, but may well be needed here
+# for proper function on multilib systems -- rex
+%{_libdir}/matecomponent-2.0/
+%{_libdir}/matecomponent/
+%dir %{_prefix}/lib/matecomponent/
+%dir %{_prefix}/lib/matecomponent/servers/
 %{_libdir}/matecorba-2.0/MateComponent_module.so
 
 %changelog
+* Tue Aug 14 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-11
+- add provide libmatecomponent-activation for future mate apps
+
+* Tue Aug 14 2012 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.4.0-10
+- add libmatecomponent-multishlib.patch, this will own the directory
+- /usr/lib/matecomponent/servers for libmatecomponent server files from
+- i686 applications for x86_64 systems.
+- fix url
+
+* Mon Aug 13 2012 Rex Dieter <rdieter at fedoraproject.org> - 1.4.0-9
+- fix subpkg deps
+- move gtk-doc stuff to -devel
+- fix some dir ownership
+- drop Group: tag
+
 * Sun Aug 12 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-8
-Temporarily remove noarch tag, add missing files to libs package.
+- Temporarily remove noarch tag, add missing files to libs package.
 
 * Fri Aug 10 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-7
 - Remove extra post macros that were not needed.